diff --git a/.gitignore b/.gitignore
index e61ec6f035..b24edc9128 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,6 +86,11 @@ nbproject
 # Node Modules
 /build/node_modules/
 
+# nodejs
+/build/lib/
+/npm-debug.log
+
+
 # Tests - auto-generated files
 /data-autotest
 /tests/coverage*
diff --git a/.gitmodules b/.gitmodules
index b9c1a3702c..bc2beee81a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "3rdparty"]
 	path = 3rdparty
-	url = git://github.com/owncloud/3rdparty.git
+	url = https://github.com/owncloud/3rdparty.git
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
new file mode 100644
index 0000000000..4473cf9056
--- /dev/null
+++ b/.scrutinizer.yml
@@ -0,0 +1,23 @@
+filter:
+    excluded_paths:
+        - '3rdparty/*'
+        - 'apps/*/3rdparty/*'
+        - 'l10n/*'
+        - 'core/l10n/*'
+        - 'apps/*/l10n/*'
+        - 'lib/l10n/*'
+        - 'core/js/tests/lib/*.js'
+        - 'core/js/jquery-1.10.0.min.js'
+        - 'core/js/jquery-migrate-1.2.1.min.js'
+        - 'core/js/jquery-showpassword.js'
+        - 'core/js/jquery-tipsy.js'
+        - 'core/js/jquery.infieldlabel.js'
+        - 'core/js/jquery-ui-1.10.0.custom.js'
+        - 'core/js/jquery.inview.js'  
+        - 'core/js/jquery.placeholder.js'
+
+        
+imports:
+    - javascript
+    - php
+
diff --git a/3rdparty b/3rdparty
index 177d3ff656..da3c9f651a 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 177d3ff656bcf1153b4def12403c5f2d4fc53e73
+Subproject commit da3c9f651a26cf076249ebf25c477e3791e69ca3
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 69f859daa9..f6aa4f0c90 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -1,15 +1,14 @@
 <?php
 
-// Init owncloud
-
-
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
+\OC::$session->close();
+
 
 // Get data
 $dir = stripslashes($_POST["dir"]);
 $files = isset($_POST["file"]) ? $_POST["file"] : $_POST["files"];
-$allFiles = isset($_POST["allfiles"]) ? $_POST["allfiles"] : $_POST["allfiles"];
+$allFiles = isset($_POST["allfiles"]) ? $_POST["allfiles"] : false;
 if ($allFiles === 'true') {
 	$allFiles = true;
 }
diff --git a/apps/files/ajax/download.php b/apps/files/ajax/download.php
index 6a34cbe4ef..4b4a7f8948 100644
--- a/apps/files/ajax/download.php
+++ b/apps/files/ajax/download.php
@@ -21,14 +21,9 @@
 *
 */
 
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem');
-
-// Init owncloud
-
-
 // Check if we are a user
 OCP\User::checkLoggedIn();
+\OC::$session->close();
 
 $files = $_GET["files"];
 $dir = $_GET["dir"];
diff --git a/apps/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php
index dd7c7dc557..dd8af39bad 100644
--- a/apps/files/ajax/getstoragestats.php
+++ b/apps/files/ajax/getstoragestats.php
@@ -1,8 +1,5 @@
 <?php
 
-// only need filesystem apps
-$RUNTIME_APPTYPES = array('filesystem');
-
 $dir = '/';
 
 if (isset($_GET['dir'])) {
@@ -10,6 +7,7 @@ if (isset($_GET['dir'])) {
 }
 
 OCP\JSON::checkLoggedIn();
+\OC::$session->close();
 
 // send back json
 OCP\JSON::success(array('data' => \OCA\Files\Helper::buildFileStorageStatistics($dir)));
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index c8286bc15c..3bb35579d5 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -1,12 +1,7 @@
 <?php
 
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem');
-
-// Init owncloud
-
-
 OCP\JSON::checkLoggedIn();
+\OC::$session->close();
 
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
diff --git a/apps/files/ajax/mimeicon.php b/apps/files/ajax/mimeicon.php
index dbb8b60112..6557ff941a 100644
--- a/apps/files/ajax/mimeicon.php
+++ b/apps/files/ajax/mimeicon.php
@@ -1,3 +1,4 @@
 <?php
+\OC::$session->close();
 
 print OC_Helper::mimetypeIcon($_GET['mime']);
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
index 93063e52eb..0a8dbc24a6 100644
--- a/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@ -1,10 +1,8 @@
 <?php
 
-// Init owncloud
-
-
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
+\OC::$session->close();
 
 // Get data
 $dir = stripslashes($_POST["dir"]);
@@ -18,7 +16,7 @@ if(\OC\Files\Filesystem::file_exists($target . '/' . $file)) {
 	exit;
 }
 
-if ($dir != '' || $file != 'Shared') {
+if ($target != '' || strtolower($file) != 'shared') {
 	$targetFile = \OC\Files\Filesystem::normalizePath($target . '/' . $file);
 	$sourceFile = \OC\Files\Filesystem::normalizePath($dir . '/' . $file);
 	if(\OC\Files\Filesystem::rename($sourceFile, $targetFile)) {
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 0187b20075..1234cf1139 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -7,7 +7,8 @@ if(!OC_User::isLoggedIn()) {
 	exit;
 }
 
-session_write_close();
+\OC::$session->close();
+
 // Get the params
 $dir = isset( $_REQUEST['dir'] ) ? '/'.trim($_REQUEST['dir'], '/\\') : '';
 $filename = isset( $_REQUEST['filename'] ) ? trim($_REQUEST['filename'], '/\\') : '';
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index b2b4fb27f7..032447460f 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -5,6 +5,7 @@
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
+\OC::$session->close();
 
 // Get the params
 $dir = isset( $_POST['dir'] ) ? stripslashes($_POST['dir']) : '';
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 40da32b223..f18bbffb74 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -1,12 +1,10 @@
 <?php
 
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem');
-
 OCP\JSON::checkLoggedIn();
+\OC::$session->close();
 
 // Load the files
-$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
+$dir = isset($_GET['dir']) ? $_GET['dir'] : '';
 $mimetypes = isset($_GET['mimetypes']) ? json_decode($_GET['mimetypes'], true) : '';
 
 // Clean up duplicates from array and deal with non-array requests
@@ -18,43 +16,39 @@ if (is_array($mimetypes)) {
 
 // make filelist
 $files = array();
+/**
+ * @var \OCP\Files\FileInfo[] $files
+ */
 // If a type other than directory is requested first load them.
-if($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) {
-	foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, 'httpd/unix-directory' ) as $file ) {
-		$file['directory'] = $dir;
-		$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
-		$file["date"] = OCP\Util::formatDate($file["mtime"]);
-		$file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
-		$files[] = $file;
-	}
+if ($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) {
+	$files = array_merge($files, \OC\Files\Filesystem::getDirectoryContent($dir, 'httpd/unix-directory'));
 }
 
 if (is_array($mimetypes) && count($mimetypes)) {
 	foreach ($mimetypes as $mimetype) {
-		foreach( \OC\Files\Filesystem::getDirectoryContent( $dir, $mimetype ) as $file ) {
-			$file['directory'] = $dir;
-			$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
-			$file["date"] = OCP\Util::formatDate($file["mtime"]);
-			$file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
-			$files[] = $file;
-		}
+		$files = array_merge($files, \OC\Files\Filesystem::getDirectoryContent($dir, $mimetype));
 	}
 } else {
-	foreach( \OC\Files\Filesystem::getDirectoryContent( $dir ) as $file ) {
-		$file['directory'] = $dir;
-		$file['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file['mimetype']);
-		$file["date"] = OCP\Util::formatDate($file["mtime"]);
-		$file['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
-		$files[] = $file;
-	}
+	$files = array_merge($files, \OC\Files\Filesystem::getDirectoryContent($dir));
+}
+// Sort by name
+usort($files, array('\OCA\Files\Helper', 'fileCmp'));
+
+$result = array();
+foreach ($files as $file) {
+	$fileData = array();
+	$fileData['directory'] = $dir;
+	$fileData['name'] = $file->getName();
+	$fileData['type'] = $file->getType();
+	$fileData['path'] = $file['path'];
+	$fileData['id'] = $file->getId();
+	$fileData['size'] = $file->getSize();
+	$fileData['mtime'] = $file->getMtime();
+	$fileData['mimetype'] = $file->getMimetype();
+	$fileData['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($file->getMimetype());
+	$fileData["date"] = OCP\Util::formatDate($file->getMtime());
+	$fileData['mimetype_icon'] = \OCA\Files\Helper::determineIcon($file);
+	$result[] = $fileData;
 }
 
-// Sort by name
-usort($files, function ($a, $b) {
-	if ($a['name'] === $b['name']) {
-		 return 0;
-	}
-	return ($a['name'] < $b['name']) ? -1 : 1;
-});
-
-OC_JSON::success(array('data' => $files));
+OC_JSON::success(array('data' => $result));
diff --git a/apps/files/ajax/rename.php b/apps/files/ajax/rename.php
index 5b07c306af..fa3ddace63 100644
--- a/apps/files/ajax/rename.php
+++ b/apps/files/ajax/rename.php
@@ -23,6 +23,7 @@
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
+\OC::$session->close();
 
 $files = new \OCA\Files\App(
 	\OC\Files\Filesystem::getView(),
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 5b32b6db9b..d5d8848380 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -1,6 +1,6 @@
 <?php
 set_time_limit(0); //scanning can take ages
-session_write_close();
+\OC::$session->close();
 
 $force = (isset($_GET['force']) and ($_GET['force'] === 'true'));
 $dir = isset($_GET['dir']) ? $_GET['dir'] : '';
diff --git a/apps/files/ajax/upgrade.php b/apps/files/ajax/upgrade.php
deleted file mode 100644
index 7237b02c0b..0000000000
--- a/apps/files/ajax/upgrade.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-set_time_limit(0); //scanning can take ages
-session_write_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/ajax/upload.php b/apps/files/ajax/upload.php
index 145f40c50d..4ed51c5277 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -58,6 +58,10 @@ if (empty($_POST['dirToken'])) {
 
 
 OCP\JSON::callCheck();
+if (!\OCP\App::isEnabled('files_encryption')) {
+	// encryption app need to create keys later, so can't close too early
+	\OC::$session->close();
+}
 
 
 // get array with current storage stats (e.g. max file size)
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php
index 909baca92e..15a2913378 100644
--- a/apps/files/appinfo/app.php
+++ b/apps/files/appinfo/app.php
@@ -12,13 +12,6 @@ OCP\App::addNavigationEntry(array("id" => "files_index",
 
 OC_Search::registerProvider('OC_Search_Provider_File');
 
-// cache hooks must be connected before all other apps.
-// since 'files' is always loaded first the hooks need to be connected here
-\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
-\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
-\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
-\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
-
 \OCP\BackgroundJob::addRegularTask('\OC\Files\Cache\BackgroundWatcher', 'checkNext');
 
 $templateManager = OC_Helper::getFileTemplateManager();
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index ef22fe9218..a8acfdb6e6 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -22,12 +22,6 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// load needed apps
-$RUNTIME_APPTYPES = array('filesystem', 'authentication', 'logging');
-
-OC_App::loadApps($RUNTIME_APPTYPES);
-
-OC_Util::obEnd();
 
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();
@@ -47,7 +41,6 @@ $server->setBaseUri($baseuri);
 $defaults = new OC_Defaults();
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, $defaults->getName()));
 $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
-$server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
 $server->addPlugin(new OC_Connector_Sabre_FilesPlugin());
 $server->addPlugin(new OC_Connector_Sabre_AbortedUploadDetectionPlugin());
 $server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
diff --git a/apps/files/command/scan.php b/apps/files/command/scan.php
index f334f29a93..25ab70af36 100644
--- a/apps/files/command/scan.php
+++ b/apps/files/command/scan.php
@@ -58,7 +58,6 @@ class Scan extends Command {
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		if ($input->getOption('all')) {
-			\OC_App::loadApps('authentication');
 			$users = $this->userManager->search('');
 		} else {
 			$users = $input->getArgument('user_id');
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index af863aca33..1bac5d2b7d 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -77,10 +77,10 @@
 }
 /* make sure there's enough room for the file actions */
 #body-user #filestable {
-	min-width: 750px;
+	min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
 }
 #body-user #controls {
-	min-width: 600px;
+	min-width: 688px; /* 768 (mobile break) - 80 (nav width) */
 }
 
 #filestable tbody tr { background-color:#fff; height:40px; }
diff --git a/apps/files/css/mobile.css b/apps/files/css/mobile.css
new file mode 100644
index 0000000000..3ad7d63483
--- /dev/null
+++ b/apps/files/css/mobile.css
@@ -0,0 +1,68 @@
+@media only screen and (max-width: 768px) {
+
+/* don’t require a minimum width for files table */
+#body-user #filestable {
+	min-width: initial !important;
+}
+
+/* do not show Deleted Files on mobile, not optimized yet and button too long */
+#controls #trash {
+	display: none;
+}
+
+/* hide size and date columns */
+table th#headerSize,
+table td.filesize,
+table th#headerDate,
+table td.date {
+	display: none;
+}
+
+/* remove shift for multiselect bar to account for missing navigation */
+table.multiselect thead {
+	padding-left: 0;
+}
+
+/* restrict length of displayed filename to prevent overflow */
+table td.filename .nametext {
+	max-width: 75% !important;
+}
+
+/* always show actions on mobile, not only on hover */
+#fileList a.action {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)" !important;
+	filter: alpha(opacity=20) !important;
+	opacity: .2 !important;
+	display: inline !important;
+}
+/* do not show Rename or Versions on mobile */
+#fileList .action.action-rename,
+#fileList .action.action-versions {
+	display: none !important;
+}
+/* some padding for better clickability */
+#fileList a.action img {
+	padding: 0 6px 0 12px;
+}
+/* hide text of the actions on mobile */
+#fileList a.action span {
+	display: none;
+}
+
+/* ellipsis on file names */
+.nametext {
+	width: 60%;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+/* proper notification area for multi line messages */
+#notification-container {
+	display: -webkit-box;
+	display: -moz-box;
+	display: -ms-flexbox;
+	display: -webkit-flex;
+	display: flex;
+}
+}
diff --git a/apps/files/index.php b/apps/files/index.php
index ad7a2e210e..73601d2621 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -27,6 +27,7 @@ OCP\User::checkLoggedIn();
 // Load the files we need
 OCP\Util::addStyle('files', 'files');
 OCP\Util::addStyle('files', 'upload');
+OCP\Util::addStyle('files', 'mobile');
 OCP\Util::addscript('files', 'file-upload');
 OCP\Util::addscript('files', 'jquery.iframe-transport');
 OCP\Util::addscript('files', 'jquery.fileupload');
@@ -62,22 +63,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 +93,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);
-	}
-
-	$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();
+// 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);
+}
+
+$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/file-upload.js b/apps/files/js/file-upload.js
index f962a7044a..371c83e742 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -82,7 +82,7 @@ OC.Upload = {
 	 */
 	isProcessing:function() {
 		var count = 0;
-		
+
 		jQuery.each(this._uploads,function(i, data) {
 			if (data.state() === 'pending') {
 				count++;
@@ -177,549 +177,558 @@ OC.Upload = {
 	checkExistingFiles: function (selection, callbacks) {
 		// TODO check filelist before uploading and show dialog on conflicts, use callbacks
 		callbacks.onNoConflicts(selection);
+	},
+
+	init: function() {
+		if ( $('#file_upload_start').exists() && $('#file_upload_start').is(':visible')) {
+
+			var file_upload_param = {
+				dropZone: $('#content'), // restrict dropZone to content div
+				autoUpload: false,
+				sequentialUploads: true,
+				//singleFileUploads is on by default, so the data.files array will always have length 1
+				/**
+				 * on first add of every selection
+				 * - check all files of originalFiles array with files in dir
+				 * - on conflict show dialog
+				 *   - skip all -> remember as single skip action for all conflicting files
+				 *   - replace all -> remember as single replace action for all conflicting files
+				 *   - choose -> show choose dialog
+				 *     - mark files to keep
+				 *       - when only existing -> remember as single skip action
+				 *       - when only new -> remember as single replace action
+				 *       - when both -> remember as single autorename action
+				 * - start uploading selection
+				 * @param {object} e
+				 * @param {object} data
+				 * @returns {boolean}
+				 */
+				add: function(e, data) {
+					OC.Upload.log('add', e, data);
+					var that = $(this);
+					var freeSpace;
+
+					// we need to collect all data upload objects before starting the upload so we can check their existence
+					// and set individual conflict actions. unfortunately there is only one variable that we can use to identify
+					// the selection a data upload is part of, so we have to collect them in data.originalFiles
+					// turning singleFileUploads off is not an option because we want to gracefully handle server errors like
+					// already exists
+
+					// create a container where we can store the data objects
+					if ( ! data.originalFiles.selection ) {
+						// initialize selection and remember number of files to upload
+						data.originalFiles.selection = {
+							uploads: [],
+							filesToUpload: data.originalFiles.length,
+							totalBytes: 0
+						};
+					}
+					var selection = data.originalFiles.selection;
+
+					// add uploads
+					if ( selection.uploads.length < selection.filesToUpload ) {
+						// remember upload
+						selection.uploads.push(data);
+					}
+
+					//examine file
+					var file = data.files[0];
+					try {
+						// FIXME: not so elegant... need to refactor that method to return a value
+						Files.isFileNameValid(file.name, FileList.getCurrentDirectory());
+					}
+					catch (errorMessage) {
+						data.textStatus = 'invalidcharacters';
+						data.errorThrown = errorMessage;
+					}
+
+					if (file.type === '' && file.size === 4096) {
+						data.textStatus = 'dirorzero';
+						data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes',
+							{filename: file.name}
+						);
+					}
+
+					// add size
+					selection.totalBytes += file.size;
+
+					// check PHP upload limit
+					if (selection.totalBytes > $('#upload_limit').val()) {
+						data.textStatus = 'sizeexceedlimit';
+						data.errorThrown = t('files', 'Total file size {size1} exceeds upload limit {size2}', {
+							'size1': humanFileSize(selection.totalBytes),
+							'size2': humanFileSize($('#upload_limit').val())
+						});
+					}
+
+					// check free space
+					freeSpace = $('#free_space').val();
+					if (freeSpace >= 0 && selection.totalBytes > freeSpace) {
+						data.textStatus = 'notenoughspace';
+						data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left', {
+							'size1': humanFileSize(selection.totalBytes),
+							'size2': humanFileSize($('#free_space').val())
+						});
+					}
+
+					// end upload for whole selection on error
+					if (data.errorThrown) {
+						// trigger fileupload fail
+						var fu = that.data('blueimp-fileupload') || that.data('fileupload');
+						fu._trigger('fail', e, data);
+						return false; //don't upload anything
+					}
+
+					// check existing files when all is collected
+					if ( selection.uploads.length >= selection.filesToUpload ) {
+
+						//remove our selection hack:
+						delete data.originalFiles.selection;
+
+						var callbacks = {
+
+							onNoConflicts: function (selection) {
+								$.each(selection.uploads, function(i, upload) {
+									upload.submit();
+								});
+							},
+							onSkipConflicts: function (selection) {
+								//TODO mark conflicting files as toskip
+							},
+							onReplaceConflicts: function (selection) {
+								//TODO mark conflicting files as toreplace
+							},
+							onChooseConflicts: function (selection) {
+								//TODO mark conflicting files as chosen
+							},
+							onCancel: function (selection) {
+								$.each(selection.uploads, function(i, upload) {
+									upload.abort();
+								});
+							}
+						};
+
+						OC.Upload.checkExistingFiles(selection, callbacks);
+
+					}
+
+					return true; // continue adding files
+				},
+				/**
+				 * called after the first add, does NOT have the data param
+				 * @param {object} e
+				 */
+				start: function(e) {
+					OC.Upload.log('start', e, null);
+					//hide the tooltip otherwise it covers the progress bar
+					$('#upload').tipsy('hide');
+				},
+				submit: function(e, data) {
+					OC.Upload.rememberUpload(data);
+					if ( ! data.formData ) {
+						// noone set update parameters, we set the minimum
+						data.formData = {
+							requesttoken: oc_requesttoken,
+									 dir: $('#dir').val()
+						};
+					}
+				},
+				fail: function(e, data) {
+					OC.Upload.log('fail', e, data);
+					if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
+						if (data.textStatus === 'abort') {
+							OC.Notification.show(t('files', 'Upload cancelled.'));
+						} else {
+							// HTTP connection problem
+							OC.Notification.show(data.errorThrown);
+							if (data.result) {
+								var result = JSON.parse(data.result);
+								if (result && result[0] && result[0].data && result[0].data.code === 'targetnotfound') {
+									// abort upload of next files if any
+									OC.Upload.cancelUploads();
+								}
+							}
+						}
+						//hide notification after 10 sec
+						setTimeout(function() {
+							OC.Notification.hide();
+						}, 10000);
+					}
+					OC.Upload.deleteUpload(data);
+				},
+				/**
+				 * called for every successful upload
+				 * @param {object} e
+				 * @param {object} data
+				 */
+				done:function(e, data) {
+					OC.Upload.log('done', e, data);
+					// handle different responses (json or body from iframe for ie)
+					var response;
+					if (typeof data.result === 'string') {
+						response = data.result;
+					} else {
+						//fetch response from iframe
+						response = data.result[0].body.innerText;
+					}
+					var result=$.parseJSON(response);
+
+					delete data.jqXHR;
+
+					if (result.status === 'error' && result.data && result.data.message){
+						data.textStatus = 'servererror';
+						data.errorThrown = result.data.message;
+						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+						fu._trigger('fail', e, data);
+					} else if (typeof result[0] === 'undefined') {
+						data.textStatus = 'servererror';
+						data.errorThrown = t('files', 'Could not get result from server.');
+						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+						fu._trigger('fail', e, data);
+					} else if (result[0].status === 'existserror') {
+						//show "file already exists" dialog
+						var original = result[0];
+						var replacement = data.files[0];
+						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+						OC.dialogs.fileexists(data, original, replacement, OC.Upload, fu);
+					} else if (result[0].status !== 'success') {
+						//delete data.jqXHR;
+						data.textStatus = 'servererror';
+						data.errorThrown = result[0].data.message; // error message has been translated on server
+						var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
+						fu._trigger('fail', e, data);
+					}
+				},
+				/**
+				 * called after last upload
+				 * @param {object} e
+				 * @param {object} data
+				 */
+				stop: function(e, data) {
+					OC.Upload.log('stop', e, data);
+				}
+			};
+
+			// initialize jquery fileupload (blueimp)
+			var fileupload = $('#file_upload_start').fileupload(file_upload_param);
+			window.file_upload_param = fileupload;
+
+			if (supportAjaxUploadWithProgress()) {
+
+				// add progress handlers
+				fileupload.on('fileuploadadd', function(e, data) {
+					OC.Upload.log('progress handle fileuploadadd', e, data);
+					//show cancel button
+					//if (data.dataType !== 'iframe') { //FIXME when is iframe used? only for ie?
+					//	$('#uploadprogresswrapper input.stop').show();
+					//}
+				});
+				// add progress handlers
+				fileupload.on('fileuploadstart', function(e, data) {
+					OC.Upload.log('progress handle fileuploadstart', e, data);
+					$('#uploadprogresswrapper input.stop').show();
+					$('#uploadprogressbar').progressbar({value:0});
+					$('#uploadprogressbar').fadeIn();
+				});
+				fileupload.on('fileuploadprogress', function(e, data) {
+					OC.Upload.log('progress handle fileuploadprogress', e, data);
+					//TODO progressbar in row
+				});
+				fileupload.on('fileuploadprogressall', function(e, data) {
+					OC.Upload.log('progress handle fileuploadprogressall', e, data);
+					var progress = (data.loaded / data.total) * 100;
+					$('#uploadprogressbar').progressbar('value', progress);
+				});
+				fileupload.on('fileuploadstop', function(e, data) {
+					OC.Upload.log('progress handle fileuploadstop', e, data);
+
+					$('#uploadprogresswrapper input.stop').fadeOut();
+					$('#uploadprogressbar').fadeOut();
+					Files.updateStorageStatistics();
+				});
+				fileupload.on('fileuploadfail', function(e, data) {
+					OC.Upload.log('progress handle fileuploadfail', e, data);
+					//if user pressed cancel hide upload progress bar and cancel button
+					if (data.errorThrown === 'abort') {
+						$('#uploadprogresswrapper input.stop').fadeOut();
+						$('#uploadprogressbar').fadeOut();
+					}
+				});
+
+			} else {
+				console.log('skipping file progress because your browser is broken');
+			}
+		}
+
+		$.assocArraySize = function(obj) {
+			// http://stackoverflow.com/a/6700/11236
+			var size = 0, key;
+			for (key in obj) {
+				if (obj.hasOwnProperty(key)) {
+					size++;
+				}
+			}
+			return size;
+		};
+
+		// warn user not to leave the page while upload is in progress
+		$(window).on('beforeunload', function(e) {
+			if (OC.Upload.isProcessing()) {
+				return t('files', 'File upload is in progress. Leaving the page now will cancel the upload.');
+			}
+		});
+
+		//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
+		if (navigator.userAgent.search(/konqueror/i) === -1) {
+			$('#file_upload_start').attr('multiple', 'multiple');
+		}
+
+		//if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
+		var crumb=$('div.crumb').first();
+		while($('div.controls').height() > 40 && crumb.next('div.crumb').length > 0) {
+			crumb.children('a').text('...');
+			crumb = crumb.next('div.crumb');
+		}
+		//if that isn't enough, start removing items from the breacrumb except for the current folder and it's parent
+		var crumb = $('div.crumb').first();
+		var next = crumb.next('div.crumb');
+		while($('div.controls').height()>40 && next.next('div.crumb').length > 0) {
+			crumb.remove();
+			crumb = next;
+			next = crumb.next('div.crumb');
+		}
+		//still not enough, start shorting down the current folder name
+		var crumb=$('div.crumb>a').last();
+		while($('div.controls').height() > 40 && crumb.text().length > 6) {
+			var text=crumb.text();
+			text = text.substr(0,text.length-6)+'...';
+			crumb.text(text);
+		}
+
+		$(document).click(function(ev) {
+			// do not close when clicking in the dropdown
+			if ($(ev.target).closest('#new').length){
+				return;
+			}
+			$('#new>ul').hide();
+			$('#new').removeClass('active');
+			if ($('#new .error').length > 0) {
+				$('#new .error').tipsy('hide');
+			}
+			$('#new li').each(function(i,element) {
+				if ($(element).children('p').length === 0) {
+					$(element).children('form').remove();
+					$(element).append('<p>'+$(element).data('text')+'</p>');
+				}
+			});
+		});
+		$('#new').click(function(event) {
+			event.stopPropagation();
+		});
+		$('#new>a').click(function() {
+			$('#new>ul').toggle();
+			$('#new').toggleClass('active');
+		});
+		$('#new li').click(function() {
+			if ($(this).children('p').length === 0) {
+				return;
+			}
+
+			$('#new .error').tipsy('hide');
+
+			$('#new li').each(function(i,element) {
+				if ($(element).children('p').length === 0) {
+					$(element).children('form').remove();
+					$(element).append('<p>'+$(element).data('text')+'</p>');
+				}
+			});
+
+			var type=$(this).data('type');
+			var text=$(this).children('p').text();
+			$(this).data('text',text);
+			$(this).children('p').remove();
+
+			// add input field
+			var form = $('<form></form>');
+			var input = $('<input type="text">');
+			var newName = $(this).attr('data-newname') || '';
+			if (newName) {
+				input.val(newName);
+			}
+			form.append(input);
+			$(this).append(form);
+			var lastPos;
+			var checkInput = function () {
+				var filename = input.val();
+				if (type === 'web' && filename.length === 0) {
+					throw t('files', 'URL cannot be empty');
+				} else if (type !== 'web' && !Files.isFileNameValid(filename)) {
+					// Files.isFileNameValid(filename) throws an exception itself
+				} else if (FileList.getCurrentDirectory() === '/' && filename.toLowerCase() === 'shared') {
+					throw t('files', 'In the home folder \'Shared\' is a reserved filename');
+				} else if (FileList.inList(filename)) {
+					throw t('files', '{new_name} already exists', {new_name: filename});
+				} else {
+					return true;
+				}
+			};
+
+			// verify filename on typing
+			input.keyup(function(event) {
+				try {
+					checkInput();
+					input.tipsy('hide');
+					input.removeClass('error');
+				} catch (error) {
+					input.attr('title', error);
+					input.tipsy({gravity: 'w', trigger: 'manual'});
+					input.tipsy('show');
+					input.addClass('error');
+				}
+			});
+
+			input.focus();
+			// pre select name up to the extension
+			lastPos = newName.lastIndexOf('.');
+			if (lastPos === -1) {
+				lastPos = newName.length;
+			}
+			input.selectRange(0, lastPos);
+			form.submit(function(event) {
+				event.stopPropagation();
+				event.preventDefault();
+				try {
+					checkInput();
+					var newname = input.val();
+					if (FileList.lastAction) {
+						FileList.lastAction();
+					}
+					var name = getUniqueName(newname);
+					if (newname !== name) {
+						FileList.checkName(name, newname, true);
+						var hidden = true;
+					} else {
+						var hidden = false;
+					}
+					switch(type) {
+						case 'file':
+							$.post(
+								OC.filePath('files', 'ajax', 'newfile.php'),
+								{dir:$('#dir').val(), filename:name},
+								function(result) {
+									if (result.status === 'success') {
+										var date = new Date();
+										// TODO: ideally addFile should be able to receive
+										// all attributes and set them automatically,
+										// and also auto-load the preview
+										var tr = FileList.addFile(name, 0, date, false, hidden);
+										tr.attr('data-size', result.data.size);
+										tr.attr('data-mime', result.data.mime);
+										tr.attr('data-id', result.data.id);
+										tr.attr('data-etag', result.data.etag);
+										tr.find('.filesize').text(humanFileSize(result.data.size));
+										var path = getPathForPreview(name);
+										Files.lazyLoadPreview(path, result.data.mime, function(previewpath) {
+											tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
+										}, null, null, result.data.etag);
+										FileActions.display(tr.find('td.filename'), true);
+									} else {
+										OC.dialogs.alert(result.data.message, t('core', 'Could not create file'));
+									}
+								}
+							);
+							break;
+						case 'folder':
+							$.post(
+								OC.filePath('files','ajax','newfolder.php'),
+								{dir:$('#dir').val(), foldername:name},
+								function(result) {
+									if (result.status === 'success') {
+										var date=new Date();
+										FileList.addDir(name, 0, date, hidden);
+										var tr = FileList.findFileEl(name);
+										tr.attr('data-id', result.data.id);
+									} else {
+										OC.dialogs.alert(result.data.message, t('core', 'Could not create folder'));
+									}
+								}
+							);
+							break;
+						case 'web':
+							if (name.substr(0,8) !== 'https://' && name.substr(0,7) !== 'http://') {
+								name = 'http://' + name;
+							}
+							var localName=name;
+							if (localName.substr(localName.length-1,1)==='/') {//strip /
+								localName=localName.substr(0,localName.length-1);
+							}
+							if (localName.indexOf('/')) {//use last part of url
+								localName=localName.split('/').pop();
+							} else { //or the domain
+								localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
+							}
+							localName = getUniqueName(localName);
+							//IE < 10 does not fire the necessary events for the progress bar.
+							if ($('html.lte9').length === 0) {
+								$('#uploadprogressbar').progressbar({value:0});
+								$('#uploadprogressbar').fadeIn();
+							}
+
+							var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
+							eventSource.listen('progress',function(progress) {
+								//IE < 10 does not fire the necessary events for the progress bar.
+								if ($('html.lte9').length === 0) {
+									$('#uploadprogressbar').progressbar('value',progress);
+								}
+							});
+							eventSource.listen('success',function(data) {
+								var mime = data.mime;
+								var size = data.size;
+								var id = data.id;
+								$('#uploadprogressbar').fadeOut();
+								var date = new Date();
+								FileList.addFile(localName, size, date, false, hidden);
+								var tr = FileList.findFileEl(localName);
+								tr.data('mime', mime).data('id', id);
+								tr.attr('data-id', id);
+								var path = $('#dir').val()+'/'+localName;
+								Files.lazyLoadPreview(path, mime, function(previewpath) {
+									tr.find('td.filename').attr('style', 'background-image:url('+previewpath+')');
+								}, null, null, data.etag);
+								FileActions.display(tr.find('td.filename'), true);
+							});
+							eventSource.listen('error',function(error) {
+								$('#uploadprogressbar').fadeOut();
+								var message = (error && error.message) || t('core', 'Error fetching URL');
+								OC.Notification.show(message);
+								//hide notification after 10 sec
+								setTimeout(function() {
+									OC.Notification.hide();
+								}, 10000);
+							});
+							break;
+					}
+					var li=form.parent();
+					form.remove();
+					/* workaround for IE 9&10 click event trap, 2 lines: */
+					$('input').first().focus();
+					$('#content').focus();
+					li.append('<p>'+li.data('text')+'</p>');
+					$('#new>a').click();
+				} catch (error) {
+					input.attr('title', error);
+					input.tipsy({gravity: 'w', trigger: 'manual'});
+					input.tipsy('show');
+					input.addClass('error');
+				}
+			});
+		});
+		window.file_upload_param = file_upload_param;
+		return file_upload_param;
 	}
 };
 
 $(document).ready(function() {
-
-	if ( $('#file_upload_start').exists() ) {
-
-		var file_upload_param = {
-			dropZone: $('#content'), // restrict dropZone to content div
-			autoUpload: false,
-			sequentialUploads: true,
-			//singleFileUploads is on by default, so the data.files array will always have length 1
-			/**
-			 * on first add of every selection
-			 * - check all files of originalFiles array with files in dir
-			 * - on conflict show dialog
-			 *   - skip all -> remember as single skip action for all conflicting files
-			 *   - replace all -> remember as single replace action for all conflicting files
-			 *   - choose -> show choose dialog
-			 *     - mark files to keep
-			 *       - when only existing -> remember as single skip action
-			 *       - when only new -> remember as single replace action
-			 *       - when both -> remember as single autorename action
-			 * - start uploading selection
-			 * @param {object} e
-			 * @param {object} data
-			 * @returns {boolean}
-			 */
-			add: function(e, data) {
-				OC.Upload.log('add', e, data);
-				var that = $(this);
-			
-				// we need to collect all data upload objects before starting the upload so we can check their existence
-				// and set individual conflict actions. unfortunately there is only one variable that we can use to identify
-				// the selection a data upload is part of, so we have to collect them in data.originalFiles
-				// turning singleFileUploads off is not an option because we want to gracefully handle server errors like
-				// already exists
-			
-				// create a container where we can store the data objects
-				if ( ! data.originalFiles.selection ) {
-					// initialize selection and remember number of files to upload
-					data.originalFiles.selection = {
-						uploads: [],
-						filesToUpload: data.originalFiles.length,
-						totalBytes: 0
-					};
-				}
-				var selection = data.originalFiles.selection;
-			
-				// add uploads
-				if ( selection.uploads.length < selection.filesToUpload ) {
-					// remember upload
-					selection.uploads.push(data);
-				}
-			
-				//examine file
-				var file = data.files[0];
-				try {
-					// FIXME: not so elegant... need to refactor that method to return a value
-					Files.isFileNameValid(file.name);
-				}
-				catch (errorMessage) {
-					data.textStatus = 'invalidcharacters';
-					data.errorThrown = errorMessage;
-				}
-			
-				if (file.type === '' && file.size === 4096) {
-					data.textStatus = 'dirorzero';
-					data.errorThrown = t('files', 'Unable to upload {filename} as it is a directory or has 0 bytes',
-						{filename: file.name}
-					);
-				}
-			
-				// add size
-				selection.totalBytes += file.size;
-			
-				// check PHP upload limit
-				if (selection.totalBytes > $('#upload_limit').val()) {
-					data.textStatus = 'sizeexceedlimit';
-					data.errorThrown = t('files', 'Total file size {size1} exceeds upload limit {size2}', {
-						'size1': humanFileSize(selection.totalBytes),
-						'size2': humanFileSize($('#upload_limit').val())
-					});
-				}
-
-				// check free space
-				if (selection.totalBytes > $('#free_space').val()) {
-					data.textStatus = 'notenoughspace';
-					data.errorThrown = t('files', 'Not enough free space, you are uploading {size1} but only {size2} is left', {
-						'size1': humanFileSize(selection.totalBytes),
-						'size2': humanFileSize($('#free_space').val())
-					});
-				}
-			
-				// end upload for whole selection on error
-				if (data.errorThrown) {
-					// trigger fileupload fail
-					var fu = that.data('blueimp-fileupload') || that.data('fileupload');
-					fu._trigger('fail', e, data);
-					return false; //don't upload anything
-				}
-
-				// check existing files when all is collected
-				if ( selection.uploads.length >= selection.filesToUpload ) {
-				
-					//remove our selection hack:
-					delete data.originalFiles.selection;
-
-					var callbacks = {
-					
-						onNoConflicts: function (selection) {
-							$.each(selection.uploads, function(i, upload) {
-								upload.submit();
-							});
-						},
-						onSkipConflicts: function (selection) {
-							//TODO mark conflicting files as toskip
-						},
-						onReplaceConflicts: function (selection) {
-							//TODO mark conflicting files as toreplace
-						},
-						onChooseConflicts: function (selection) {
-							//TODO mark conflicting files as chosen
-						},
-						onCancel: function (selection) {
-							$.each(selection.uploads, function(i, upload) {
-								upload.abort();
-							});
-						}
-					};
-
-					OC.Upload.checkExistingFiles(selection, callbacks);
-				
-				}
-
-				return true; // continue adding files
-			},
-			/**
-			 * called after the first add, does NOT have the data param
-			 * @param {object} e
-			 */
-			start: function(e) {
-				OC.Upload.log('start', e, null);
-			},
-			submit: function(e, data) {
-				OC.Upload.rememberUpload(data);
-				if ( ! data.formData ) {
-					// noone set update parameters, we set the minimum
-					data.formData = {
-						requesttoken: oc_requesttoken,
-								 dir: $('#dir').val()
-					};
-				}
-			},
-			fail: function(e, data) {
-				OC.Upload.log('fail', e, data);
-				if (typeof data.textStatus !== 'undefined' && data.textStatus !== 'success' ) {
-					if (data.textStatus === 'abort') {
-						OC.Notification.show(t('files', 'Upload cancelled.'));
-					} else {
-						// HTTP connection problem
-						OC.Notification.show(data.errorThrown);
-						if (data.result) {
-							var result = JSON.parse(data.result);
-							if (result && result[0] && result[0].data && result[0].data.code === 'targetnotfound') {
-								// abort upload of next files if any
-								OC.Upload.cancelUploads();
-							}
-						}
-					}
-					//hide notification after 10 sec
-					setTimeout(function() {
-						OC.Notification.hide();
-					}, 10000);
-				}
-				OC.Upload.deleteUpload(data);
-			},
-			/**
-			 * called for every successful upload
-			 * @param {object} e
-			 * @param {object} data
-			 */
-			done:function(e, data) {
-				OC.Upload.log('done', e, data);
-				// handle different responses (json or body from iframe for ie)
-				var response;
-				if (typeof data.result === 'string') {
-					response = data.result;
-				} else {
-					//fetch response from iframe
-					response = data.result[0].body.innerText;
-				}
-				var result=$.parseJSON(response);
-
-				delete data.jqXHR;
-
-				if (result.status === 'error' && result.data && result.data.message){
-					data.textStatus = 'servererror';
-					data.errorThrown = result.data.message;
-					var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-					fu._trigger('fail', e, data);
-				} else if (typeof result[0] === 'undefined') {
-					data.textStatus = 'servererror';
-					data.errorThrown = t('files', 'Could not get result from server.');
-					var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-					fu._trigger('fail', e, data);
-				} else if (result[0].status === 'existserror') {
-					//show "file already exists" dialog
-					var original = result[0];
-					var replacement = data.files[0];
-					var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-					OC.dialogs.fileexists(data, original, replacement, OC.Upload, fu);
-				} else if (result[0].status !== 'success') {
-					//delete data.jqXHR;
-					data.textStatus = 'servererror';
-					data.errorThrown = result[0].data.message; // error message has been translated on server
-					var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload');
-					fu._trigger('fail', e, data);
-				}
-			},
-			/**
-			 * called after last upload
-			 * @param {object} e
-			 * @param {object} data
-			 */
-			stop: function(e, data) {
-				OC.Upload.log('stop', e, data);
-			}
-		};
-
-		// initialize jquery fileupload (blueimp)
-		var fileupload = $('#file_upload_start').fileupload(file_upload_param);
-		window.file_upload_param = fileupload;
-
-		if (supportAjaxUploadWithProgress()) {
-
-			// add progress handlers
-			fileupload.on('fileuploadadd', function(e, data) {
-				OC.Upload.log('progress handle fileuploadadd', e, data);
-				//show cancel button
-				//if (data.dataType !== 'iframe') { //FIXME when is iframe used? only for ie?
-				//	$('#uploadprogresswrapper input.stop').show();
-				//}
-			});
-			// add progress handlers
-			fileupload.on('fileuploadstart', function(e, data) {
-				OC.Upload.log('progress handle fileuploadstart', e, data);
-				$('#uploadprogresswrapper input.stop').show();
-				$('#uploadprogressbar').progressbar({value:0});
-				$('#uploadprogressbar').fadeIn();
-			});
-			fileupload.on('fileuploadprogress', function(e, data) {
-				OC.Upload.log('progress handle fileuploadprogress', e, data);
-				//TODO progressbar in row
-			});
-			fileupload.on('fileuploadprogressall', function(e, data) {
-				OC.Upload.log('progress handle fileuploadprogressall', e, data);
-				var progress = (data.loaded / data.total) * 100;
-				$('#uploadprogressbar').progressbar('value', progress);
-			});
-			fileupload.on('fileuploadstop', function(e, data) {
-				OC.Upload.log('progress handle fileuploadstop', e, data);
-				
-				$('#uploadprogresswrapper input.stop').fadeOut();
-				$('#uploadprogressbar').fadeOut();
-			    Files.updateStorageStatistics();
-			});
-			fileupload.on('fileuploadfail', function(e, data) {
-				OC.Upload.log('progress handle fileuploadfail', e, data);
-				//if user pressed cancel hide upload progress bar and cancel button
-				if (data.errorThrown === 'abort') {
-					$('#uploadprogresswrapper input.stop').fadeOut();
-					$('#uploadprogressbar').fadeOut();
-				}
-			});
-
-		} else {
-			console.log('skipping file progress because your browser is broken');
-		}
-	}
-
-	$.assocArraySize = function(obj) {
-		// http://stackoverflow.com/a/6700/11236
-		var size = 0, key;
-		for (key in obj) {
-			if (obj.hasOwnProperty(key)) {
-				size++;
-			}
-		}
-		return size;
-	};
-
-	// warn user not to leave the page while upload is in progress
-	$(window).on('beforeunload', function(e) {
-		if (OC.Upload.isProcessing()) {
-			return t('files', 'File upload is in progress. Leaving the page now will cancel the upload.');
-		}
-	});
-
-	//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
-	if (navigator.userAgent.search(/konqueror/i) === -1) {
-		$('#file_upload_start').attr('multiple', 'multiple');
-	}
-
-	//if the breadcrumb is to long, start by replacing foldernames with '...' except for the current folder
-	var crumb=$('div.crumb').first();
-	while($('div.controls').height() > 40 && crumb.next('div.crumb').length > 0) {
-		crumb.children('a').text('...');
-		crumb = crumb.next('div.crumb');
-	}
-	//if that isn't enough, start removing items from the breacrumb except for the current folder and it's parent
-	var crumb = $('div.crumb').first();
-	var next = crumb.next('div.crumb');
-	while($('div.controls').height()>40 && next.next('div.crumb').length > 0) {
-		crumb.remove();
-		crumb = next;
-		next = crumb.next('div.crumb');
-	}
-	//still not enough, start shorting down the current folder name
-	var crumb=$('div.crumb>a').last();
-	while($('div.controls').height() > 40 && crumb.text().length > 6) {
-		var text=crumb.text();
-		text = text.substr(0,text.length-6)+'...';
-		crumb.text(text);
-	}
-
-	$(document).click(function(ev) {
-		// do not close when clicking in the dropdown
-		if ($(ev.target).closest('#new').length){
-			return;
-		}
-		$('#new>ul').hide();
-		$('#new').removeClass('active');
-		if ($('#new .error').length > 0) {
-			$('#new .error').tipsy('hide');
-		}
-		$('#new li').each(function(i,element) {
-			if ($(element).children('p').length === 0) {
-				$(element).children('form').remove();
-				$(element).append('<p>'+$(element).data('text')+'</p>');
-			}
-		});
-	});
-	$('#new').click(function(event) {
-		event.stopPropagation();
-	});
-	$('#new>a').click(function() {
-		$('#new>ul').toggle();
-		$('#new').toggleClass('active');
-	});
-	$('#new li').click(function() {
-		if ($(this).children('p').length === 0) {
-			return;
-		}
-		
-		$('#new .error').tipsy('hide');
-
-		$('#new li').each(function(i,element) {
-			if ($(element).children('p').length === 0) {
-				$(element).children('form').remove();
-				$(element).append('<p>'+$(element).data('text')+'</p>');
-			}
-		});
-
-		var type=$(this).data('type');
-		var text=$(this).children('p').text();
-		$(this).data('text',text);
-		$(this).children('p').remove();
-		
-		// add input field
-		var form = $('<form></form>');
-		var input = $('<input type="text">');
-		var newName = $(this).attr('data-newname') || '';
-		if (newName) {
-			input.val(newName);
-		}
-		form.append(input);
-		$(this).append(form);
-		var lastPos;
-		var checkInput = function () {
-			var filename = input.val();
-			if (type === 'web' && filename.length === 0) {
-				throw t('files', 'URL cannot be empty');
-			} else if (type !== 'web' && !Files.isFileNameValid(filename)) {
-				// Files.isFileNameValid(filename) throws an exception itself
-			} else if ($('#dir').val() === '/' && filename === 'Shared') {
-				throw t('files', 'In the home folder \'Shared\' is a reserved filename');
-			} else if (FileList.inList(filename)) {
-				throw t('files', '{new_name} already exists', {new_name: filename});
-			} else {
-				return true;
-			}
-		};
-
-		// verify filename on typing
-		input.keyup(function(event) {
-			try {
-				checkInput();
-				input.tipsy('hide');
-				input.removeClass('error');
-			} catch (error) {
-				input.attr('title', error);
-				input.tipsy({gravity: 'w', trigger: 'manual'});
-				input.tipsy('show');
-				input.addClass('error');
-			}
-		});
-
-		input.focus();
-		// pre select name up to the extension
-		lastPos = newName.lastIndexOf('.');
-		if (lastPos === -1) {
-			lastPos = newName.length;
-		}
-		input.selectRange(0, lastPos);
-		form.submit(function(event) {
-			event.stopPropagation();
-			event.preventDefault();
-			try {
-				checkInput();
-				var newname = input.val();
-				if (FileList.lastAction) {
-					FileList.lastAction();
-				}
-				var name = getUniqueName(newname);
-				if (newname !== name) {
-					FileList.checkName(name, newname, true);
-					var hidden = true;
-				} else {
-					var hidden = false;
-				}
-				switch(type) {
-					case 'file':
-						$.post(
-							OC.filePath('files', 'ajax', 'newfile.php'),
-							{dir:$('#dir').val(), filename:name},
-							function(result) {
-								if (result.status === 'success') {
-									var date = new Date();
-									// TODO: ideally addFile should be able to receive
-									// all attributes and set them automatically,
-									// and also auto-load the preview
-									var tr = FileList.addFile(name, 0, date, false, hidden);
-									tr.attr('data-size', result.data.size);
-									tr.attr('data-mime', result.data.mime);
-									tr.attr('data-id', result.data.id);
-									tr.attr('data-etag', result.data.etag);
-									tr.find('.filesize').text(humanFileSize(result.data.size));
-									var path = getPathForPreview(name);
-									Files.lazyLoadPreview(path, result.data.mime, function(previewpath) {
-										tr.find('td.filename').attr('style','background-image:url('+previewpath+')');
-									}, null, null, result.data.etag);
-									FileActions.display(tr.find('td.filename'), true);
-								} else {
-									OC.dialogs.alert(result.data.message, t('core', 'Could not create file'));
-								}
-							}
-						);
-						break;
-					case 'folder':
-						$.post(
-							OC.filePath('files','ajax','newfolder.php'),
-							{dir:$('#dir').val(), foldername:name},
-							function(result) {
-								if (result.status === 'success') {
-									var date=new Date();
-									FileList.addDir(name, 0, date, hidden);
-									var tr = FileList.findFileEl(name);
-									tr.attr('data-id', result.data.id);
-								} else {
-									OC.dialogs.alert(result.data.message, t('core', 'Could not create folder'));
-								}
-							}
-						);
-						break;
-					case 'web':
-						if (name.substr(0,8) !== 'https://' && name.substr(0,7) !== 'http://') {
-							name = 'http://' + name;
-						}
-						var localName=name;
-						if (localName.substr(localName.length-1,1)==='/') {//strip /
-							localName=localName.substr(0,localName.length-1);
-						}
-						if (localName.indexOf('/')) {//use last part of url
-							localName=localName.split('/').pop();
-						} else { //or the domain
-							localName=(localName.match(/:\/\/(.[^\/]+)/)[1]).replace('www.','');
-						}
-						localName = getUniqueName(localName);
-						//IE < 10 does not fire the necessary events for the progress bar.
-						if ($('html.lte9').length === 0) {
-							$('#uploadprogressbar').progressbar({value:0});
-							$('#uploadprogressbar').fadeIn();
-						}
-
-						var eventSource=new OC.EventSource(OC.filePath('files','ajax','newfile.php'),{dir:$('#dir').val(),source:name,filename:localName});
-						eventSource.listen('progress',function(progress) {
-							//IE < 10 does not fire the necessary events for the progress bar.
-							if ($('html.lte9').length === 0) {
-								$('#uploadprogressbar').progressbar('value',progress);
-							}
-						});
-						eventSource.listen('success',function(data) {
-							var mime = data.mime;
-							var size = data.size;
-							var id = data.id;
-							$('#uploadprogressbar').fadeOut();
-							var date = new Date();
-							FileList.addFile(localName, size, date, false, hidden);
-							var tr = FileList.findFileEl(localName);
-							tr.data('mime', mime).data('id', id);
-							tr.attr('data-id', id);
-							var path = $('#dir').val()+'/'+localName;
-							Files.lazyLoadPreview(path, mime, function(previewpath) {
-								tr.find('td.filename').attr('style', 'background-image:url('+previewpath+')');
-							}, null, null, data.etag);
-							FileActions.display(tr.find('td.filename'), true);
-						});
-						eventSource.listen('error',function(error) {
-							$('#uploadprogressbar').fadeOut();
-							var message = (error && error.message) || t('core', 'Error fetching URL');
-							OC.Notification.show(message);
-							//hide notification after 10 sec
-							setTimeout(function() {
-								OC.Notification.hide();
-							}, 10000);
-						});
-						break;
-				}
-				var li=form.parent();
-				form.remove();
-				/* workaround for IE 9&10 click event trap, 2 lines: */
-				$('input').first().focus();
-				$('#content').focus();
-				li.append('<p>'+li.data('text')+'</p>');
-				$('#new>a').click();
-			} catch (error) {
-				input.attr('title', error);
-				input.tipsy({gravity: 'w', trigger: 'manual'});
-				input.tipsy('show');
-				input.addClass('error');
-			}
-		});
-	});
-	window.file_upload_param = file_upload_param;
+	OC.Upload.init();
 });
+
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 9a69d7b368..a7d1fa9d8a 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -15,21 +15,33 @@ var FileActions = {
 	defaults: {},
 	icons: {},
 	currentFile: null,
-	register: function (mime, name, permissions, icon, action) {
+	register: function (mime, name, permissions, icon, action, displayName) {
 		if (!FileActions.actions[mime]) {
 			FileActions.actions[mime] = {};
 		}
 		if (!FileActions.actions[mime][name]) {
 			FileActions.actions[mime][name] = {};
 		}
+		if (!displayName) {
+			displayName = t('files', name);
+		}
 		FileActions.actions[mime][name]['action'] = action;
 		FileActions.actions[mime][name]['permissions'] = permissions;
+		FileActions.actions[mime][name]['displayName'] = displayName;
 		FileActions.icons[name] = icon;
 	},
 	setDefault: function (mime, name) {
 		FileActions.defaults[mime] = name;
 	},
 	get: function (mime, type, permissions) {
+		var actions = this.getActions(mime, type, permissions);
+		var filteredActions = {};
+		$.each(actions, function (name, action) {
+			filteredActions[name] = action.action;
+		});
+		return filteredActions;
+	},
+	getActions: function (mime, type, permissions) {
 		var actions = {};
 		if (FileActions.actions.all) {
 			actions = $.extend(actions, FileActions.actions.all);
@@ -51,7 +63,7 @@ var FileActions = {
 		var filteredActions = {};
 		$.each(actions, function (name, action) {
 			if (action.permissions & permissions) {
-				filteredActions[name] = action.action;
+				filteredActions[name] = action;
 			}
 		});
 		return filteredActions;
@@ -82,7 +94,7 @@ var FileActions = {
 	 */
 	display: function (parent, triggerEvent) {
 		FileActions.currentFile = parent;
-		var actions = FileActions.get(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
+		var actions = FileActions.getActions(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
 		var file = FileActions.getCurrentFile();
 		var nameLinks;
 		if (FileList.findFileEl(file).data('renaming')) {
@@ -105,15 +117,16 @@ var FileActions = {
 			event.data.actionFunc(file);
 		};
 
-		var addAction = function (name, action) {
+		var addAction = function (name, action, displayName) {
 			// NOTE: Temporary fix to prevent rename action in root of Shared directory
 			if (name === 'Rename' && $('#dir').val() === '/Shared') {
 				return true;
 			}
 
 			if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
+
 				var img = FileActions.icons[name],
-					actionText = t('files', name),
+					actionText = displayName,
 					actionContainer = 'a.name>span.fileactions';
 
 				if (name === 'Rename') {
@@ -125,7 +138,7 @@ var FileActions = {
 				if (img.call) {
 					img = img(file);
 				}
-				var html = '<a href="#" class="action" data-action="' + name + '">';
+				var html = '<a href="#" class="action action-' + name.toLowerCase() + '" data-action="' + name + '">';
 				if (img) {
 					html += '<img class ="svg" src="' + img + '" />';
 				}
@@ -133,8 +146,7 @@ var FileActions = {
 
 				var element = $(html);
 				element.data('action', name);
-				//alert(element);
-				element.on('click', {a: null, elem: parent, actionFunc: actions[name]}, actionHandler);
+				element.on('click', {a: null, elem: parent, actionFunc: actions[name].action}, actionHandler);
 				parent.find(actionContainer).append(element);
 			}
 
@@ -142,12 +154,15 @@ var FileActions = {
 
 		$.each(actions, function (name, action) {
 			if (name !== 'Share') {
-				addAction(name, action);
+				displayName = action.displayName;
+				ah = action.action;
+
+				addAction(name, ah, displayName);
 			}
 		});
 		if(actions.Share && !($('#dir').val() === '/' && file === 'Shared')){
-			// t('files', 'Share')
-			addAction('Share', actions.Share);
+			displayName = t('files', 'Share');
+			addAction('Share', actions.Share, displayName);
 		}
 
 		// remove the existing delete action
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 550c10dba3..cda4e823a7 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -71,7 +71,7 @@ window.FileList={
 		});
 		// filename td
 		td = $('<td></td>').attr({
-			"class": "filename",
+			"class": "filename svg",
 			"style": 'background-image:url('+iconurl+'); background-size: 32px;'
 		});
 		var rand = Math.random().toString(16).slice(2);
@@ -137,7 +137,9 @@ window.FileList={
 
 		var download_url = null;
 		if (!param.download_url) {
-			download_url = OC.Router.generate('download', { file: $('#dir').val()+'/'+name });
+			download_url = OC.generateUrl(
+				'apps/files/download{file}',
+				{ file: $('#dir').val()+'/'+name });
 		} else {
 			download_url = param.download_url;
 		}
@@ -419,15 +421,12 @@ window.FileList={
 			len = input.val().length;
 		}
 		input.selectRange(0, len);
-
 		var checkInput = function () {
 			var filename = input.val();
 			if (filename !== oldname) {
-				if (!Files.isFileNameValid(filename)) {
-					// Files.isFileNameValid(filename) throws an exception itself
-				} else if($('#dir').val() === '/' && filename === 'Shared') {
-					throw t('files','In the home folder \'Shared\' is a reserved filename');
-				} else if (FileList.inList(filename)) {
+				// Files.isFileNameValid(filename) throws an exception itself
+				Files.isFileNameValid(filename, FileList.getCurrentDirectory());
+				if (FileList.inList(filename)) {
 					throw t('files', '{new_name} already exists', {new_name: filename});
 				}
 			}
@@ -1156,9 +1155,9 @@ $(document).ready(function() {
 			// need to initially switch the dir to the one from the hash (IE8)
 			FileList.changeDirectory(parseCurrentDirFromUrl(), false, true);
 		}
-	}
 
-	FileList.setCurrentDir(parseCurrentDirFromUrl(), false);
+		FileList.setCurrentDir(parseCurrentDirFromUrl(), false);
+	}
 
 	FileList.createFileSummary();
 });
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index f454612070..1137364db4 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -87,9 +87,12 @@ var Files = {
 	 * Throws a string exception with an error message if
 	 * the file name is not valid
 	 */
-	isFileNameValid: function (name) {
+	isFileNameValid: function (name, root) {
 		var trimmedName = name.trim();
-		if (trimmedName === '.' || trimmedName === '..') {
+		if (trimmedName === '.'
+				|| trimmedName === '..'
+				|| (root === '/' &&  trimmedName.toLowerCase() === 'shared'))
+		{
 			throw t('files', '"{name}" is an invalid file name.', {name: name});
 		} else if (trimmedName.length === 0) {
 			throw t('files', 'File name cannot be empty.');
@@ -193,11 +196,14 @@ var Files = {
 		if (width !== Files.lastWidth) {
 			if ((width < Files.lastWidth || firstRun) && width < Files.breadcrumbsWidth) {
 				if (Files.hiddenBreadcrumbs === 0) {
-					Files.breadcrumbsWidth -= $(Files.breadcrumbs[1]).get(0).offsetWidth;
-					$(Files.breadcrumbs[1]).find('a').hide();
-					$(Files.breadcrumbs[1]).append('<span>...</span>');
-					Files.breadcrumbsWidth += $(Files.breadcrumbs[1]).get(0).offsetWidth;
-					Files.hiddenBreadcrumbs = 2;
+					bc = $(Files.breadcrumbs[1]).get(0);
+					if (typeof bc != 'undefined') {
+						Files.breadcrumbsWidth -= bc.offsetWidth;
+						$(Files.breadcrumbs[1]).find('a').hide();
+						$(Files.breadcrumbs[1]).append('<span>...</span>');
+						Files.breadcrumbsWidth += bc.offsetWidth;
+						Files.hiddenBreadcrumbs = 2;
+					}
 				}
 				var i = Files.hiddenBreadcrumbs;
 				while (width < Files.breadcrumbsWidth && i > 1 && i < Files.breadcrumbs.length - 1) {
@@ -780,9 +786,9 @@ Files.lazyLoadPreview = function(path, mime, ready, width, height, etag) {
 
 		if ( $('#isPublic').length ) {
 			urlSpec.t = $('#dirToken').val();
-			previewURL = OC.Router.generate('core_ajax_public_preview', urlSpec);
+			previewURL = OC.generateUrl('/publicpreview.png?') + $.param(urlSpec);
 		} else {
-			previewURL = OC.Router.generate('core_ajax_preview', urlSpec);
+			previewURL = OC.generateUrl('/core/preview.png?') + $.param(urlSpec);
 		}
 		previewURL = previewURL.replace('(', '%28');
 		previewURL = previewURL.replace(')', '%29');
diff --git a/apps/files/js/upgrade.js b/apps/files/js/upgrade.js
deleted file mode 100644
index 714adf824a..0000000000
--- 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/am_ET.php b/apps/files/l10n/am_ET.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/am_ET.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 0148f5ca3c..147d77d4cb 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
 "Could not move %s" => "فشل في نقل %s",
 "File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها",
 "Unable to set upload directory." => "غير قادر على تحميل المجلد",
 "Invalid Token" => "علامة غير صالحة",
 "No file was uploaded. Unknown error" => "لم يتم رفع أي ملف , خطأ غير معروف",
@@ -14,12 +15,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "المجلد المؤقت غير موجود",
 "Failed to write to disk" => "خطأ في الكتابة على القرص الصلب",
 "Not enough storage available" => "لا يوجد مساحة تخزينية كافية",
-"Upload failed. Could not get file info." => "فشلت عملية الرفع. تعذر الحصول على معلومات الملف.",
 "Upload failed. Could not find uploaded file" => "*فشلت علمية الرفع. تعذر إيجاد الملف الذي تم رفعه.\n*فشلت علمية التحميل. تعذر إيجاد الملف الذي تم تحميله.",
+"Upload failed. Could not get file info." => "فشلت عملية الرفع. تعذر الحصول على معلومات الملف.",
 "Invalid directory." => "مسار غير صحيح.",
 "Files" => "الملفات",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت",
-"Not enough space available" => "لا توجد مساحة كافية",
 "Upload cancelled." => "تم إلغاء عملية رفع الملفات .",
 "Could not get result from server." => "تعذر الحصول على نتيجة من الخادم",
 "File upload is in progress. Leaving the page now will cancel the upload." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
@@ -34,8 +34,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"),
 "{dirs} and {files}" => "{dirs} و {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"),
-"'.' is an invalid file name." => "\".\" اسم ملف غير صحيح.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها",
 "Your storage is full, files can not be updated or synced anymore!" => "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
 "Your storage is almost full ({usedSpacePercent}%)" => "مساحتك التخزينية امتلأت تقريبا ",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
@@ -59,6 +57,7 @@ $TRANSLATIONS = array(
 "Save" => "حفظ",
 "New" => "جديد",
 "Text file" => "ملف",
+"New folder" => "مجلد جديد",
 "Folder" => "مجلد",
 "From link" => "من رابط",
 "Deleted files" => "حذف الملفات",
@@ -69,7 +68,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "حجم الترفيع أعلى من المسموح",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم.",
 "Files are being scanned, please wait." => "يرجى الانتظار , جاري فحص الملفات .",
-"Current scanning" => "الفحص الحالي",
-"Upgrading filesystem cache..." => "تحديث ذاكرة التخزين المؤقت(الكاش)  الخاصة بملفات النظام ..."
+"Current scanning" => "الفحص الحالي"
 );
 $PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/files/l10n/az.php b/apps/files/l10n/az.php
index 70ab6572ba..0157af093e 100644
--- a/apps/files/l10n/az.php
+++ b/apps/files/l10n/az.php
@@ -1,7 +1,7 @@
 <?php
 $TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array("")
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
 );
-$PLURAL_FORMS = "nplurals=1; plural=0;";
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index f7266517e9..11f3525690 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s কে স্থানান্তর করা সম্ভব হলো না -  এই নামের ফাইল বিদ্যমান",
 "Could not move %s" => "%s  কে স্থানান্তর করা সম্ভব হলো না",
 "File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।",
 "No file was uploaded. Unknown error" => "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।",
 "There is no error, the file uploaded with success" => "কোন সমস্যা হয় নি, ফাইল আপলোড সুসম্পন্ন হয়েছে।",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "আপলোড করা  ফাইলটি php.ini তে বর্ণিত  upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ",
@@ -13,7 +14,6 @@ $TRANSLATIONS = array(
 "Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ",
 "Invalid directory." => "ভুল ডিরেক্টরি",
 "Files" => "ফাইল",
-"Not enough space available" => "যথেষ্ঠ পরিমাণ স্থান নেই",
 "Upload cancelled." => "আপলোড বাতিল করা হয়েছে।",
 "File upload is in progress. Leaving the page now will cancel the upload." => "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
 "{new_name} already exists" => "{new_name} টি বিদ্যমান",
@@ -25,8 +25,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"'.' is an invalid file name." => "টি একটি অননুমোদিত নাম।",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।",
 "Error" => "সমস্যা",
 "Name" => "রাম",
 "Size" => "আকার",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 261713bc58..a4418b1be5 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -3,13 +3,15 @@ $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.",
-"File name must not contain \"/\". Please choose a different name." => "El nom de fitxer no pot contenir \"/\". Indiqueu un nom diferent.",
+"\"%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",
 "Error while downloading %s to %s" => "S'ha produït un error en baixar %s a %s",
 "Error when creating the file" => "S'ha produït un error en crear el fitxer",
 "Folder name cannot be empty." => "El nom de la carpeta no pot ser buit.",
-"Folder name must not contain \"/\". Please choose a different name." => "El nom de la carpeta no pot contenir \"/\". Indiqueu un nom diferent.",
 "Error when creating the folder" => "S'ha produït un error en crear la carpeta",
 "Unable to set upload directory." => "No es pot establir la carpeta de pujada.",
 "Invalid Token" => "Testimoni no vàlid",
@@ -22,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Falta un fitxer temporal",
 "Failed to write to disk" => "Ha fallat en escriure al disc",
 "Not enough storage available" => "No hi ha prou espai disponible",
-"Upload failed. Could not get file info." => "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer.",
 "Upload failed. Could not find uploaded file" => "La pujada ha fallat. El fitxer pujat no s'ha trobat.",
+"Upload failed. Could not get file info." => "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer.",
 "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",
-"Not enough space available" => "No hi ha prou espai disponible",
+"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à.",
@@ -36,6 +39,7 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} ja existeix",
 "Could not create file" => "No s'ha pogut crear el fitxer",
 "Could not create folder" => "No s'ha pogut crear la carpeta",
+"Error fetching URL" => "Error en obtenir la URL",
 "Share" => "Comparteix",
 "Delete permanently" => "Esborra permanentment",
 "Rename" => "Reanomena",
@@ -48,8 +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"),
-"'.' is an invalid file name." => "'.' és un nom no vàlid per un fitxer.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
+"\"{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.",
@@ -87,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "La pujada és massa gran",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor",
 "Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
-"Current scanning" => "Actualment escanejant",
-"Upgrading filesystem cache..." => "Actualitzant la memòria de cau del sistema de fitxers..."
+"Current scanning" => "Actualment escanejant"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 44e0fdae1f..5bcf1087b9 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -3,14 +3,15 @@ $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.",
-"File name must not contain \"/\". Please choose a different name." => "Název souboru nesmí obsahovat \"/\". Vyberte prosím jiné jméno.",
+"\"%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.",
 "Error while downloading %s to %s" => "Chyba při stahování %s do %s",
 "Error when creating the file" => "Chyba při vytváření souboru",
 "Folder name cannot be empty." => "Název složky nemůže být prázdný.",
-"Folder name must not contain \"/\". Please choose a different name." => "Název složky nesmí obsahovat \"/\". Zvolte prosím jiný.",
 "Error when creating the folder" => "Chyba při vytváření složky",
 "Unable to set upload directory." => "Nelze nastavit adresář pro nahrané soubory.",
 "Invalid Token" => "Neplatný token",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
 "Failed to write to disk" => "Zápis na disk selhal",
 "Not enough storage available" => "Nedostatek dostupného úložného prostoru",
-"Upload failed. Could not get file info." => "Nahrávání selhalo. Nepodařilo se získat informace o souboru.",
 "Upload failed. Could not find uploaded file" => "Nahrávání selhalo. Nepodařilo se nalézt nahraný soubor.",
+"Upload failed. Could not get file info." => "Nahrávání selhalo. Nepodařilo se získat informace o souboru.",
 "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ů",
-"Not enough space available" => "Nedostatek volného místa",
+"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í.",
@@ -50,8 +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ů"),
-"'.' is an invalid file name." => "'.' je neplatným názvem souboru.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
+"\"{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",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Odesílaný soubor je příliš velký",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
 "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
-"Current scanning" => "Aktuální prohledávání",
-"Upgrading filesystem cache..." => "Aktualizuji mezipaměť souborového systému..."
+"Current scanning" => "Aktuální prohledávání"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
index 2a007761c5..df93ca507b 100644
--- a/apps/files/l10n/cy_GB.php
+++ b/apps/files/l10n/cy_GB.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli",
 "Could not move %s" => "Methwyd symud %s",
 "File name cannot be empty." => "Does dim hawl cael enw ffeil gwag.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.",
 "No file was uploaded. Unknown error" => "Ni lwythwyd ffeil i fyny. Gwall anhysbys.",
 "There is no error, the file uploaded with success" => "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:",
@@ -14,7 +15,6 @@ $TRANSLATIONS = array(
 "Not enough storage available" => "Dim digon o le storio ar gael",
 "Invalid directory." => "Cyfeiriadur annilys.",
 "Files" => "Ffeiliau",
-"Not enough space available" => "Dim digon o le ar gael",
 "Upload cancelled." => "Diddymwyd llwytho i fyny.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses.",
 "{new_name} already exists" => "{new_name} yn bodoli'n barod",
@@ -27,8 +27,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array("","","",""),
 "_%n file_::_%n files_" => array("","","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","","",""),
-"'.' is an invalid file name." => "Mae '.' yn enw ffeil annilys.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.",
 "Your storage is full, files can not be updated or synced anymore!" => "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr.",
@@ -57,7 +55,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Maint llwytho i fyny'n rhy fawr",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn.",
 "Files are being scanned, please wait." => "Arhoswch, mae ffeiliau'n cael eu sganio.",
-"Current scanning" => "Sganio cyfredol",
-"Upgrading filesystem cache..." => "Uwchraddio storfa system ffeiliau..."
+"Current scanning" => "Sganio cyfredol"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 9b7722444a..7069849b43 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
 "Could not move %s" => "Kunne ikke flytte %s",
 "File name cannot be empty." => "Filnavnet kan ikke stå tomt.",
-"File name must not contain \"/\". Please choose a different name." => "Filnavnet må ikke indeholde \"/\". Vælg venligst et andet navn.",
+"\"%s\" is an invalid file name." => "\"%s\" er et ugyldigt filnavn.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
+"The target folder has been moved or deleted." => "Mappen er blevet slettet eller fjernet.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Navnet %s er allerede i brug i mappen %s. Vælg venligst et andet navn.",
 "Not a valid source" => "Ikke en gyldig kilde",
 "Server is not allowed to open URLs, please check the server configuration" => "Server har ikke tilladelse til at åbne URL'er. Kontroller venligst serverens indstillinger",
 "Error while downloading %s to %s" => "Fejl ved hentning af %s til %s",
 "Error when creating the file" => "Fejl ved oprettelse af fil",
 "Folder name cannot be empty." => "Mappenavnet kan ikke være tomt.",
-"Folder name must not contain \"/\". Please choose a different name." => "Mappenavnet må ikke indeholde \"/\". Vælg venligst et andet navn.",
 "Error when creating the folder" => "Fejl ved oprettelse af mappen",
 "Unable to set upload directory." => "Ude af stand til at vælge upload mappe.",
 "Invalid Token" => "Ugyldig Token ",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Manglende midlertidig mappe.",
 "Failed to write to disk" => "Fejl ved skrivning til disk.",
 "Not enough storage available" => "Der er ikke nok plads til rådlighed",
-"Upload failed. Could not get file info." => "Upload fejlede. Kunne ikke hente filinformation.",
 "Upload failed. Could not find uploaded file" => "Upload fejlede. Kunne ikke finde den uploadede fil.",
+"Upload failed. Could not get file info." => "Upload fejlede. Kunne ikke hente filinformation.",
 "Invalid directory." => "Ugyldig mappe.",
 "Files" => "Filer",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.",
-"Not enough space available" => "ikke nok tilgængelig ledig plads ",
+"Total file size {size1} exceeds upload limit {size2}" => "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage",
 "Upload cancelled." => "Upload afbrudt.",
 "Could not get result from server." => "Kunne ikke hente resultat fra server.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n fil","%n filer"),
 "{dirs} and {files}" => "{dirs} og {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Uploader %n fil","Uploader %n filer"),
-"'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
+"\"{name}\" is an invalid file name." => "'{name}' er et ugyldigt filnavn.",
 "Your storage is full, files can not be updated or synced anymore!" => "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Upload er for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server.",
 "Files are being scanned, please wait." => "Filerne bliver indlæst, vent venligst.",
-"Current scanning" => "Indlæser",
-"Upgrading filesystem cache..." => "Opgraderer filsystems cachen..."
+"Current scanning" => "Indlæser"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index b209fee88a..376cbaa4e2 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
 "Could not move %s" => "Konnte %s nicht verschieben",
 "File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
-"File name must not contain \"/\". Please choose a different name." => "Der Dateiname darf kein \"/\" enthalten. Bitte wähle einen anderen Namen.",
+"\"%s\" is an invalid file name." => "\"%s\" ist kein gültiger Dateiname.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+"The target folder has been moved or deleted." => "Der Zielordner wurde verschoben oder gelöscht.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Der Name %s wird bereits im Ordner %s benutzt. Bitte wähle  einen anderen Namen.",
 "Not a valid source" => "Keine gültige Quelle",
 "Server is not allowed to open URLs, please check the server configuration" => "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
 "Error while downloading %s to %s" => "Fehler beim Herunterladen von %s nach %s",
 "Error when creating the file" => "Fehler beim Erstellen der Datei",
 "Folder name cannot be empty." => "Der Ordner-Name darf nicht leer sein.",
-"Folder name must not contain \"/\". Please choose a different name." => "Der Ordner-Name darf kein \"/\" enthalten. Bitte wähle einen anderen Namen.",
 "Error when creating the folder" => "Fehler beim Erstellen des Ordners",
 "Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
 "Invalid Token" => "Ungültiges Merkmal",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Not enough storage available" => "Nicht genug Speicher vorhanden.",
-"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
 "Upload failed. Could not find uploaded file" => "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden.",
+"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
-"Not enough space available" => "Nicht genug Speicherplatz verfügbar",
+"Total file size {size1} exceeds upload limit {size2}" => "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
 "Upload cancelled." => "Upload abgebrochen.",
 "Could not get result from server." => "Ergebnis konnte nicht vom Server abgerufen werden.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
 "{dirs} and {files}" => "{dirs} und {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
-"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+"\"{name}\" is an invalid file name." => "\"{name}\" ist kein gültiger Dateiname.",
 "Your storage is full, files can not be updated or synced anymore!" => "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melden Dich nochmals ab und wieder an.",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Der Upload ist zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
-"Current scanning" => "Scanne",
-"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
+"Current scanning" => "Scanne"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_AT.php b/apps/files/l10n/de_AT.php
index 0157af093e..e1b55f6dd1 100644
--- a/apps/files/l10n/de_AT.php
+++ b/apps/files/l10n/de_AT.php
@@ -1,7 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Share" => "Freigeben",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Save" => "Speichern",
+"Download" => "Herunterladen",
+"Delete" => "Löschen"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_CH.php b/apps/files/l10n/de_CH.php
index b950429346..8b70d7f0f0 100644
--- a/apps/files/l10n/de_CH.php
+++ b/apps/files/l10n/de_CH.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
 "Could not move %s" => "Konnte %s nicht verschieben",
 "File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.",
 "Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
 "Invalid Token" => "Ungültiges Merkmal",
 "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
@@ -16,7 +17,6 @@ $TRANSLATIONS = array(
 "Not enough storage available" => "Nicht genug Speicher vorhanden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
-"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
 "Upload cancelled." => "Upload abgebrochen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
 "{new_name} already exists" => "{new_name} existiert bereits",
@@ -29,8 +29,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array("","%n Ordner"),
 "_%n file_::_%n files_" => array("","%n Dateien"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
-"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
@@ -62,7 +60,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Der Upload ist zu gross",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
-"Current scanning" => "Scanne",
-"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
+"Current scanning" => "Scanne"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 76cdce00e4..0df0f46dc2 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits.",
 "Could not move %s" => "Konnte %s nicht verschieben",
 "File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
-"File name must not contain \"/\". Please choose a different name." => "Der Dateiname darf kein \"/\" enthalten. Bitte wählen Sie einen anderen Namen.",
+"\"%s\" is an invalid file name." => "\"%s\" ist kein gültiger Dateiname.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+"The target folder has been moved or deleted." => "Der Ziel-Ordner wurde verschoben oder gelöscht.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Der Name %s wird bereits im Ordner %s benutzt. Bitte wählen Sie einen anderen Namen.",
 "Not a valid source" => "Keine gültige Quelle",
 "Server is not allowed to open URLs, please check the server configuration" => "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
 "Error while downloading %s to %s" => "Fehler beim Herunterladen von %s nach %s",
 "Error when creating the file" => "Fehler beim Erstellen der Datei",
 "Folder name cannot be empty." => "Der Ordner-Name darf nicht leer sein.",
-"Folder name must not contain \"/\". Please choose a different name." => "Der Ordner-Name darf kein \"/\" enthalten. Bitte wählen Sie einen anderen Namen.",
 "Error when creating the folder" => "Fehler beim Erstellen des Ordners",
 "Unable to set upload directory." => "Das Upload-Verzeichnis konnte nicht gesetzt werden.",
 "Invalid Token" => "Ungültiges Merkmal",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Not enough storage available" => "Nicht genug Speicher vorhanden.",
-"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden.",
 "Upload failed. Could not find uploaded file" => "Hochladen fehlgeschlagen. Die hochgeladene Datei konnte nicht gefunden werden.",
+"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden.",
 "Invalid directory." => "Ungültiges Verzeichnis.",
 "Files" => "Dateien",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
-"Not enough space available" => "Nicht genügend Speicherplatz verfügbar",
+"Total file size {size1} exceeds upload limit {size2}" => "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
 "Upload cancelled." => "Upload abgebrochen.",
 "Could not get result from server." => "Ergebnis konnte nicht vom Server abgerufen werden.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
 "{dirs} and {files}" => "{dirs} und {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"),
-"'.' is an invalid file name." => "'.' ist kein gültiger Dateiname.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+"\"{name}\" is an invalid file name." => "\"{name}\" ist kein gültiger Dateiname.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden sich nochmals ab und wieder an.",
@@ -77,7 +78,7 @@ $TRANSLATIONS = array(
 "New" => "Neu",
 "New text file" => "Neue Textdatei",
 "Text file" => "Textdatei",
-"New folder" => "Neues Verzeichnis",
+"New folder" => "Neues Ordner",
 "Folder" => "Ordner",
 "From link" => "Von einem Link",
 "Deleted files" => "Gelöschte Dateien",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Der Upload ist zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
-"Current scanning" => "Scanne",
-"Upgrading filesystem cache..." => "Dateisystem-Cache wird aktualisiert ..."
+"Current scanning" => "Scanne"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 9efe1af7dd..9144cf3ea1 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -3,14 +3,14 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Αδυναμία μετακίνησης του %s - υπάρχει ήδη αρχείο με αυτό το όνομα",
 "Could not move %s" => "Αδυναμία μετακίνησης του %s",
 "File name cannot be empty." => "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
-"File name must not contain \"/\". Please choose a different name." => "Το όνομα αρχείου δεν μπορεί να περιέχει \"/\". Παρακαλώ επιλέξτε ένα διαφορετικό όνομα. ",
+"\"%s\" is an invalid file name." => "Το \"%s\" είναι ένα μη έγκυρο όνομα αρχείου.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Το όνομα %s χρησιμοποιείτε ήδη στον φάκελο %s. Παρακαλώ επιλέξτε ένα άλλο όνομα.",
 "Not a valid source" => "Μη έγκυρη πηγή",
 "Server is not allowed to open URLs, please check the server configuration" => "Ο διακομιστής δεν επιτρέπεται να ανοίγει URL, παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή",
 "Error while downloading %s to %s" => "Σφάλμα κατά τη λήψη του %s στο %s",
 "Error when creating the file" => "Σφάλμα κατά τη δημιουργία του αρχείου",
 "Folder name cannot be empty." => "Το όνομα φακέλου δεν μπορεί να είναι κενό.",
-"Folder name must not contain \"/\". Please choose a different name." => "Το όνομα φακέλου δεν μπορεί να περιέχει \"/\". Παρακαλώ επιλέξτε ένα διαφορετικό όνομα. ",
 "Error when creating the folder" => "Σφάλμα δημιουργίας φακέλου",
 "Unable to set upload directory." => "Αδυναμία ορισμού καταλόγου αποστολής.",
 "Invalid Token" => "Μη έγκυρο Token",
@@ -23,12 +23,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
 "Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο",
 "Not enough storage available" => "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος",
-"Upload failed. Could not get file info." => "Η φόρτωση απέτυχε. Αδυναμία λήψης πληροφοριών αρχείων.",
 "Upload failed. Could not find uploaded file" => "Η φόρτωση απέτυχε. Αδυναμία εύρεσης αρχείου προς φόρτωση.",
+"Upload failed. Could not get file info." => "Η φόρτωση απέτυχε. Αδυναμία λήψης πληροφοριών αρχείων.",
 "Invalid directory." => "Μη έγκυρος φάκελος.",
 "Files" => "Αρχεία",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes",
-"Not enough space available" => "Δεν υπάρχει αρκετός διαθέσιμος χώρος",
 "Upload cancelled." => "Η αποστολή ακυρώθηκε.",
 "Could not get result from server." => "Αδυναμία λήψης αποτελέσματος από το διακομιστή.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
@@ -50,8 +49,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"),
 "{dirs} and {files}" => "{Κατάλογοι αρχείων} και {αρχεία}",
 "_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"),
-"'.' is an invalid file name." => "'.' είναι μη έγκυρο όνομα αρχείου.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
+"\"{name}\" is an invalid file name." => "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
@@ -89,7 +87,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
 "Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
-"Current scanning" => "Τρέχουσα ανίχνευση",
-"Upgrading filesystem cache..." => "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
+"Current scanning" => "Τρέχουσα ανίχνευση"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php
index ac93aa68ab..3fb2cb62e6 100644
--- a/apps/files/l10n/en_GB.php
+++ b/apps/files/l10n/en_GB.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Could not move %s - File with this name already exists",
 "Could not move %s" => "Could not move %s",
 "File name cannot be empty." => "File name cannot be empty.",
-"File name must not contain \"/\". Please choose a different name." => "File name must not contain \"/\". Please choose a different name.",
+"\"%s\" is an invalid file name." => "\"%s\" is an invalid file name.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.",
+"The target folder has been moved or deleted." => "The target folder has been moved or deleted.",
 "The name %s is already used in the folder %s. Please choose a different name." => "The name %s is already used in the folder %s. Please choose a different name.",
 "Not a valid source" => "Not a valid source",
 "Server is not allowed to open URLs, please check the server configuration" => "Server is not allowed to open URLs, please check the server configuration",
 "Error while downloading %s to %s" => "Error whilst downloading %s to %s",
 "Error when creating the file" => "Error when creating the file",
 "Folder name cannot be empty." => "Folder name cannot be empty.",
-"Folder name must not contain \"/\". Please choose a different name." => "Folder name must not contain \"/\". Please choose a different name.",
 "Error when creating the folder" => "Error when creating the folder",
 "Unable to set upload directory." => "Unable to set upload directory.",
 "Invalid Token" => "Invalid Token",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Missing a temporary folder",
 "Failed to write to disk" => "Failed to write to disk",
 "Not enough storage available" => "Not enough storage available",
-"Upload failed. Could not get file info." => "Upload failed. Could not get file info.",
 "Upload failed. Could not find uploaded file" => "Upload failed. Could not find uploaded file",
+"Upload failed. Could not get file info." => "Upload failed. Could not get file info.",
 "Invalid directory." => "Invalid directory.",
 "Files" => "Files",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Unable to upload {filename} as it is a directory or has 0 bytes",
-"Not enough space available" => "Not enough space available",
+"Total file size {size1} exceeds upload limit {size2}" => "Total file size {size1} exceeds upload limit {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Not enough free space, you are uploading {size1} but only {size2} is left",
 "Upload cancelled." => "Upload cancelled.",
 "Could not get result from server." => "Could not get result from server.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "File upload is in progress. Leaving the page now will cancel the upload.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n file","%n files"),
 "{dirs} and {files}" => "{dirs} and {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Uploading %n file","Uploading %n files"),
-"'.' is an invalid file name." => "'.' is an invalid file name.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.",
+"\"{name}\" is an invalid file name." => "\"{name}\" is an invalid file name.",
 "Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Upload too large",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "The files you are trying to upload exceed the maximum size for file uploads on this server.",
 "Files are being scanned, please wait." => "Files are being scanned, please wait.",
-"Current scanning" => "Current scanning",
-"Upgrading filesystem cache..." => "Upgrading filesystem cache..."
+"Current scanning" => "Current scanning"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 81cfa03fd6..b92fef5000 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -3,13 +3,12 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas",
 "Could not move %s" => "Ne eblis movi %s",
 "File name cannot be empty." => "Dosiernomo devas ne malpleni.",
-"File name must not contain \"/\". Please choose a different name." => "La dosieronomo ne devas enhavi “/”. Bonvolu elekti malsaman nomon.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
 "The name %s is already used in the folder %s. Please choose a different name." => "La nomo %s jam uziĝas en la dosierujo %s. Bonvolu elekti malsaman nomon.",
 "Not a valid source" => "Nevalida fonto",
 "Error while downloading %s to %s" => "Eraris elŝuto de %s al %s",
 "Error when creating the file" => "Eraris la kreo de la dosiero",
 "Folder name cannot be empty." => "La dosierujnomo ne povas malpleni.",
-"Folder name must not contain \"/\". Please choose a different name." => "La dosiernomo ne devas enhavi “/”. Bonvolu elekti malsaman nomon.",
 "Error when creating the folder" => "Eraris la kreo de la dosierujo",
 "Unable to set upload directory." => "Ne povis agordiĝi la alŝuta dosierujo.",
 "No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
@@ -21,12 +20,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
 "Not enough storage available" => "Ne haveblas sufiĉa memoro",
-"Upload failed. Could not get file info." => "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero.",
 "Upload failed. Could not find uploaded file" => "La alŝuto malsukcesis. Ne troviĝis alŝutota dosiero.",
+"Upload failed. Could not get file info." => "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero.",
 "Invalid directory." => "Nevalida dosierujo.",
 "Files" => "Dosieroj",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn",
-"Not enough space available" => "Ne haveblas sufiĉa spaco",
 "Upload cancelled." => "La alŝuto nuliĝis.",
 "Could not get result from server." => "Ne povis ekhaviĝi rezulto el la servilo.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
@@ -45,8 +43,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n dosiero","%n dosieroj"),
 "{dirs} and {files}" => "{dirs} kaj {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Alŝutatas %n dosiero","Alŝutatas %n dosieroj"),
-"'.' is an invalid file name." => "'.' ne estas valida dosiernomo.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
 "Your storage is full, files can not be updated or synced anymore!" => "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas.",
@@ -79,7 +75,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Alŝuto tro larĝa",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo.",
 "Files are being scanned, please wait." => "Dosieroj estas skanataj, bonvolu atendi.",
-"Current scanning" => "Nuna skano",
-"Upgrading filesystem cache..." => "Ĝisdatiĝas dosiersistema kaŝmemoro..."
+"Current scanning" => "Nuna skano"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index bfbb80e896..6083ab2a5d 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No se pudo mover %s - Ya existe un archivo con ese nombre.",
 "Could not move %s" => "No se pudo mover %s",
 "File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
-"File name must not contain \"/\". Please choose a different name." => "El nombre del archivo, NO puede contener el simbolo\"/\", por favor elija un nombre diferente.",
+"\"%s\" is an invalid file name." => "\"%s\" es un nombre de archivo inválido.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
+"The target folder has been moved or deleted." => "La carpeta destino fue movida o eliminada.",
 "The name %s is already used in the folder %s. Please choose a different name." => "El nombre %s ya está en uso por la carpeta %s. Por favor elija uno diferente.",
-"Not a valid source" => "No es un origen válido",
-"Server is not allowed to open URLs, please check the server configuration" => "El servidor no puede acceder URLs; revise la configuración del servidor.",
+"Not a valid source" => "No es una fuente válida",
+"Server is not allowed to open URLs, please check the server configuration" => "La configuración del servidor no le permite abrir URLs, revísela.",
 "Error while downloading %s to %s" => "Error mientras se descargaba %s a %s",
 "Error when creating the file" => "Error al crear el archivo",
 "Folder name cannot be empty." => "El nombre de la carpeta no puede estar vacío.",
-"Folder name must not contain \"/\". Please choose a different name." => "El nombre de la carpeta, NO puede contener el simbolo\"/\", por favor elija un nombre diferente.",
 "Error when creating the folder" => "Error al crear la carpeta.",
 "Unable to set upload directory." => "Incapaz de crear directorio de subida.",
 "Invalid Token" => "Token Inválido",
@@ -23,17 +24,18 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Falta la carpeta temporal",
 "Failed to write to disk" => "Falló al escribir al disco",
 "Not enough storage available" => "No hay suficiente espacio disponible",
-"Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
 "Upload failed. Could not find uploaded file" => "Actualización fallida. No se pudo encontrar el archivo subido",
+"Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
 "Invalid directory." => "Directorio inválido.",
 "Files" => "Archivos",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
-"Not enough space available" => "No hay suficiente espacio disponible",
+"Total file size {size1} exceeds upload limit {size2}" => "El tamaño total del archivo {size1} excede el límite {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}",
 "Upload cancelled." => "Subida cancelada.",
 "Could not get result from server." => "No se pudo obtener respuesta del servidor.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
 "URL cannot be empty" => "La dirección URL no puede estar vacía",
-"In the home folder 'Shared' is a reserved filename" => "En la carpeta de inicio, 'Shared' es un nombre reservado",
+"In the home folder 'Shared' is a reserved filename" => "En la carpeta home, no se puede usar 'Shared'",
 "{new_name} already exists" => "{new_name} ya existe",
 "Could not create file" => "No se pudo crear el archivo",
 "Could not create folder" => "No se pudo crear la carpeta",
@@ -45,13 +47,12 @@ $TRANSLATIONS = array(
 "Could not rename file" => "No se pudo renombrar el archivo",
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
 "undo" => "deshacer",
-"Error deleting file." => "Error borrando el archivo.",
+"Error deleting file." => "Error al borrar el archivo",
 "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
 "_%n file_::_%n files_" => array("%n archivo","%n archivos"),
 "{dirs} and {files}" => "{dirs} y {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
-"'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
+"\"{name}\" is an invalid file name." => "\"{name}\" es un nombre de archivo inválido.",
 "Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Subida demasido grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
 "Files are being scanned, please wait." => "Los archivos están siendo escaneados,  por favor espere.",
-"Current scanning" => "Escaneo actual",
-"Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos..."
+"Current scanning" => "Escaneo actual"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 78d6388cd9..105321276c 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -3,6 +3,14 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con este nombre ya existe",
 "Could not move %s" => "No se pudo mover %s ",
 "File name cannot be empty." => "El nombre del archivo no puede quedar vacío.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
+"The name %s is already used in the folder %s. Please choose a different name." => "El nombre %s está en uso en el directorio %s. Por favor elija un otro nombre.",
+"Not a valid source" => "No es una fuente válida",
+"Server is not allowed to open URLs, please check the server configuration" => "El servidor no está permitido abrir las URLs, por favor chequee la configuración del servidor",
+"Error while downloading %s to %s" => "Error mientras se descargaba %s a %s",
+"Error when creating the file" => "Error al crear el archivo",
+"Folder name cannot be empty." => "El nombre del directorio no puede estar vacío.",
+"Error when creating the folder" => "Error al crear el directorio",
 "Unable to set upload directory." => "No fue posible crear el directorio de subida.",
 "Invalid Token" => "Token Inválido",
 "No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
@@ -14,32 +22,44 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "Error al escribir en el disco",
 "Not enough storage available" => "No hay suficiente almacenamiento",
+"Upload failed. Could not find uploaded file" => "Falló la carga. No se pudo encontrar el archivo subido.",
+"Upload failed. Could not get file info." => "Falló la carga. No se pudo obtener la información del archivo.",
 "Invalid directory." => "Directorio inválido.",
 "Files" => "Archivos",
-"Not enough space available" => "No hay suficiente espacio disponible",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.",
 "Upload cancelled." => "La subida fue cancelada",
+"Could not get result from server." => "No se pudo obtener resultados del servidor.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
+"URL cannot be empty" => "La URL no puede estar vacía",
+"In the home folder 'Shared' is a reserved filename" => "En el directorio inicial 'Shared' es un nombre de archivo reservado",
 "{new_name} already exists" => "{new_name} ya existe",
+"Could not create file" => "No se pudo crear el archivo",
+"Could not create folder" => "No se pudo crear el directorio",
+"Error fetching URL" => "Error al obtener la URL",
 "Share" => "Compartir",
 "Delete permanently" => "Borrar permanentemente",
 "Rename" => "Cambiar nombre",
 "Pending" => "Pendientes",
+"Could not rename file" => "No se pudo renombrar el archivo",
 "replaced {new_name} with {old_name}" => "se reemplazó {new_name} con {old_name}",
 "undo" => "deshacer",
+"Error deleting file." => "Error al borrar el archivo.",
 "_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
 "_%n file_::_%n files_" => array("%n archivo","%n archivos"),
 "{dirs} and {files}" => "{carpetas} y {archivos}",
 "_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
-"'.' is an invalid file name." => "'.' es un nombre de archivo inválido.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
 "Your storage is full, files can not be updated or synced anymore!" => "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando",
 "Your storage is almost full ({usedSpacePercent}%)" => "El almacenamiento está casi lleno ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.",
 "Your download is being prepared. This might take some time if the files are big." => "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes.",
+"Error moving file" => "Error moviendo el archivo",
 "Error" => "Error",
 "Name" => "Nombre",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
+"Invalid folder name. Usage of 'Shared' is reserved." => "Nombre de directorio inválido. 'Shared' está reservado.",
 "%s could not be renamed" => "No se pudo renombrar %s",
 "Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
@@ -51,19 +71,20 @@ $TRANSLATIONS = array(
 "Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
 "Save" => "Guardar",
 "New" => "Nuevo",
+"New text file" => "Nuevo archivo de texto",
 "Text file" => "Archivo de texto",
 "New folder" => "Nueva Carpeta",
 "Folder" => "Carpeta",
 "From link" => "Desde enlace",
 "Deleted files" => "Archivos borrados",
 "Cancel upload" => "Cancelar subida",
+"You don’t have permission to upload or create files here" => "No tienes permisos para subir o crear archivos aquí",
 "Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
 "Download" => "Descargar",
 "Delete" => "Borrar",
 "Upload too large" => "El tamaño del archivo que querés subir es demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que intentás subir sobrepasan el tamaño máximo ",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor esperá.",
-"Current scanning" => "Escaneo actual",
-"Upgrading filesystem cache..." => "Actualizando el cache del sistema de archivos"
+"Current scanning" => "Escaneo actual"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_CL.php b/apps/files/l10n/es_CL.php
index 6f97758878..4f5e35bd88 100644
--- a/apps/files/l10n/es_CL.php
+++ b/apps/files/l10n/es_CL.php
@@ -1,9 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "Files" => "Archivos",
+"Share" => "Compartir",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Upload" => "Subir"
+"Error" => "Error",
+"Upload" => "Subir",
+"Download" => "Descargar"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_MX.php b/apps/files/l10n/es_MX.php
index 0b7571defc..f8a72f95d8 100644
--- a/apps/files/l10n/es_MX.php
+++ b/apps/files/l10n/es_MX.php
@@ -3,14 +3,13 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "No se pudo mover %s - Ya existe un archivo con ese nombre.",
 "Could not move %s" => "No se pudo mover %s",
 "File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
-"File name must not contain \"/\". Please choose a different name." => "El nombre del archivo, NO puede contener el simbolo\"/\", por favor elija un nombre diferente.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
 "The name %s is already used in the folder %s. Please choose a different name." => "El nombre %s ya está en uso por la carpeta %s. Por favor elija uno diferente.",
 "Not a valid source" => "No es un origen válido",
 "Server is not allowed to open URLs, please check the server configuration" => "El servidor no puede acceder URLs; revise la configuración del servidor.",
 "Error while downloading %s to %s" => "Error mientras se descargaba %s a %s",
 "Error when creating the file" => "Error al crear el archivo",
 "Folder name cannot be empty." => "El nombre de la carpeta no puede estar vacío.",
-"Folder name must not contain \"/\". Please choose a different name." => "El nombre de la carpeta, NO puede contener el simbolo\"/\", por favor elija un nombre diferente.",
 "Error when creating the folder" => "Error al crear la carpeta.",
 "Unable to set upload directory." => "Incapaz de crear directorio de subida.",
 "Invalid Token" => "Token Inválido",
@@ -23,12 +22,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Falta la carpeta temporal",
 "Failed to write to disk" => "Falló al escribir al disco",
 "Not enough storage available" => "No hay suficiente espacio disponible",
-"Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
 "Upload failed. Could not find uploaded file" => "Actualización fallida. No se pudo encontrar el archivo subido",
+"Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
 "Invalid directory." => "Directorio inválido.",
 "Files" => "Archivos",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
-"Not enough space available" => "No hay suficiente espacio disponible",
 "Upload cancelled." => "Subida cancelada.",
 "Could not get result from server." => "No se pudo obtener respuesta del servidor.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
@@ -50,8 +48,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n archivo","%n archivos"),
 "{dirs} and {files}" => "{dirs} y {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Subiendo %n archivo","Subiendo %n archivos"),
-"'.' is an invalid file name." => "'.' no es un nombre de archivo válido.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
 "Your storage is full, files can not be updated or synced anymore!" => "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su almacenamiento está casi lleno ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
@@ -89,7 +85,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Subida demasido grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor.",
 "Files are being scanned, please wait." => "Los archivos están siendo escaneados,  por favor espere.",
-"Current scanning" => "Escaneo actual",
-"Upgrading filesystem cache..." => "Actualizando caché del sistema de archivos..."
+"Current scanning" => "Escaneo actual"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index fd03152773..f1fdc82673 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -3,14 +3,13 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ei saa liigutada faili %s - samanimeline fail on juba olemas",
 "Could not move %s" => "%s liigutamine ebaõnnestus",
 "File name cannot be empty." => "Faili nimi ei saa olla tühi.",
-"File name must not contain \"/\". Please choose a different name." => "Faili nimi ei tohi sisaldada \"/\". Palun vali mõni teine nimi.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Nimi %s on juba kasutusel kataloogis %s. Palun vali mõni teine nimi.",
 "Not a valid source" => "Pole korrektne lähteallikas",
 "Server is not allowed to open URLs, please check the server configuration" => "Server ei võimalda URL-ide avamist, palun kontrolli serveri seadistust",
 "Error while downloading %s to %s" => "Viga %s allalaadimisel %s",
 "Error when creating the file" => "Viga faili loomisel",
 "Folder name cannot be empty." => "Kataloogi nimi ei saa olla tühi.",
-"Folder name must not contain \"/\". Please choose a different name." => "Kataloogi nimi ei tohi sisaldada \"/\". Palun vali mõni teine nimi.",
 "Error when creating the folder" => "Viga kataloogi loomisel",
 "Unable to set upload directory." => "Üleslaadimiste kausta määramine ebaõnnestus.",
 "Invalid Token" => "Vigane kontrollkood",
@@ -23,12 +22,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
 "Not enough storage available" => "Saadaval pole piisavalt ruumi",
-"Upload failed. Could not get file info." => "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus.",
 "Upload failed. Could not find uploaded file" => "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud",
+"Upload failed. Could not get file info." => "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus.",
 "Invalid directory." => "Vigane kaust.",
 "Files" => "Failid",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
-"Not enough space available" => "Pole piisavalt ruumi",
 "Upload cancelled." => "Üleslaadimine tühistati.",
 "Could not get result from server." => "Serverist ei saadud tulemusi",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
@@ -50,8 +48,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n fail","%n faili"),
 "{dirs} and {files}" => "{dirs} ja {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Laadin üles %n faili","Laadin üles %n faili"),
-"'.' is an invalid file name." => "'.' on vigane failinimi.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
 "Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse.",
@@ -89,7 +85,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Üleslaadimine on liiga suur",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse.",
 "Files are being scanned, please wait." => "Faile skannitakse, palun oota.",
-"Current scanning" => "Praegune skannimine",
-"Upgrading filesystem cache..." => "Failisüsteemi puhvri uuendamine..."
+"Current scanning" => "Praegune skannimine"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 5df480c2bc..be601eecfb 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -3,13 +3,13 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
 "Could not move %s" => "Ezin dira fitxategiak mugitu %s",
 "File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
-"File name must not contain \"/\". Please choose a different name." => "Fitxategi izenak ezin du \"/\" izan. Mesedez hautatu beste izen bat.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
 "The name %s is already used in the folder %s. Please choose a different name." => "%s izena dagoeneko erabilita dago %s karpetan. Mesdez hautatu izen ezberdina.",
 "Not a valid source" => "Ez da jatorri baliogarria",
+"Server is not allowed to open URLs, please check the server configuration" => "Zerbitzaria ez dago URLak irekitzeko baimendua, mesedez egiaztatu zerbitzariaren konfigurazioa",
 "Error while downloading %s to %s" => "Errorea %s %sra deskargatzerakoan",
 "Error when creating the file" => "Errorea fitxategia sortzerakoan",
 "Folder name cannot be empty." => "Karpeta izena ezin da hutsa izan.",
-"Folder name must not contain \"/\". Please choose a different name." => "Karpeta izenak ezin du \"/\" izan. Mesedez hautatu beste izen bat.",
 "Error when creating the folder" => "Errorea karpeta sortzerakoan",
 "Unable to set upload directory." => "Ezin da igoera direktorioa ezarri.",
 "Invalid Token" => "Lekuko baliogabea",
@@ -22,12 +22,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Aldi bateko karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
 "Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
-"Upload failed. Could not get file info." => "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu.",
 "Upload failed. Could not find uploaded file" => "Igoerak huts egin du. Ezin izan da igotako fitxategia aurkitu",
+"Upload failed. Could not get file info." => "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu.",
 "Invalid directory." => "Baliogabeko karpeta.",
 "Files" => "Fitxategiak",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako",
-"Not enough space available" => "Ez dago leku nahikorik.",
 "Upload cancelled." => "Igoera ezeztatuta",
 "Could not get result from server." => "Ezin da zerbitzaritik emaitzik lortu",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
@@ -36,6 +35,7 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} dagoeneko existitzen da",
 "Could not create file" => "Ezin izan da fitxategia sortu",
 "Could not create folder" => "Ezin izan da karpeta sortu",
+"Error fetching URL" => "Errorea URLa eskuratzerakoan",
 "Share" => "Elkarbanatu",
 "Delete permanently" => "Ezabatu betirako",
 "Rename" => "Berrizendatu",
@@ -48,8 +48,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
 "{dirs} and {files}" => "{dirs} eta {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"),
-"'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
 "Your storage is full, files can not be updated or synced anymore!" => "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi",
@@ -87,7 +85,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Igoera handiegia da",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira.",
 "Files are being scanned, please wait." => "Fitxategiak eskaneatzen ari da, itxoin mezedez.",
-"Current scanning" => "Orain eskaneatzen ari da",
-"Upgrading filesystem cache..." => "Fitxategi sistemaren katxea eguneratzen..."
+"Current scanning" => "Orain eskaneatzen ari da"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eu_ES.php b/apps/files/l10n/eu_ES.php
new file mode 100644
index 0000000000..293e6de837
--- /dev/null
+++ b/apps/files/l10n/eu_ES.php
@@ -0,0 +1,10 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("",""),
+"Save" => "Gorde",
+"Download" => "Deskargatu",
+"Delete" => "Ezabatu"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 4f3257bc07..e1142aba16 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -1,8 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "%s نمی تواند حرکت کند - در حال حاضر پرونده با این نام وجود دارد. ",
+"Could not move %s - File with this name already exists" => "%s نمی توان جابجا کرد - در حال حاضر پرونده با این نام وجود دارد. ",
 "Could not move %s" => "%s نمی تواند حرکت کند ",
 "File name cannot be empty." => "نام پرونده نمی تواند خالی باشد.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند.",
 "Unable to set upload directory." => "قادر به تنظیم پوشه آپلود نمی باشد.",
 "Invalid Token" => "رمز نامعتبر",
 "No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
@@ -16,7 +17,6 @@ $TRANSLATIONS = array(
 "Not enough storage available" => "فضای کافی در دسترس نیست",
 "Invalid directory." => "فهرست راهنما نامعتبر می باشد.",
 "Files" => "پرونده‌ها",
-"Not enough space available" => "فضای کافی در دسترس نیست",
 "Upload cancelled." => "بار گذاری لغو شد",
 "File upload is in progress. Leaving the page now will cancel the upload." => "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
 "{new_name} already exists" => "{نام _جدید} در حال حاضر وجود دارد.",
@@ -28,9 +28,7 @@ $TRANSLATIONS = array(
 "undo" => "بازگشت",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"'.' is an invalid file name." => "'.'   یک نام پرونده نامعتبر است.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند.",
+"_Uploading %n file_::_Uploading %n files_" => array("در حال بارگذاری %n فایل"),
 "Your storage is full, files can not be updated or synced anymore!" => "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
 "Your storage is almost full ({usedSpacePercent}%)" => "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد.",
@@ -61,7 +59,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد",
 "Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
-"Current scanning" => "بازرسی کنونی",
-"Upgrading filesystem cache..." => "بهبود فایل سیستمی ذخیره گاه..."
+"Current scanning" => "بازرسی کنونی"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index d1241b77da..6b94d8b4fa 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -3,15 +3,17 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa",
 "Could not move %s" => "Kohteen %s siirto ei onnistunut",
 "File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.",
-"File name must not contain \"/\". Please choose a different name." => "Tiedoston nimessä ei saa olla merkkiä \"/\". Valitse toinen nimi.",
+"\"%s\" is an invalid file name." => "\"%s\" on virheellinen tiedostonimi.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
+"The target folder has been moved or deleted." => "Kohdekansio on siirretty tai poistettu.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Nimi %s on jo käytössä kansiossa %s. Valitse toinen nimi.",
 "Not a valid source" => "Virheellinen lähde",
 "Server is not allowed to open URLs, please check the server configuration" => "Palvelimen ei ole lupa avata verkko-osoitteita. Tarkista palvelimen asetukset",
 "Error while downloading %s to %s" => "Virhe ladatessa kohdetta %s sijaintiin %s",
 "Error when creating the file" => "Virhe tiedostoa luotaessa",
 "Folder name cannot be empty." => "Kansion nimi ei voi olla tyhjä.",
-"Folder name must not contain \"/\". Please choose a different name." => "Kansion nimessä ei saa olla merkkiä \"/\". Valitse toinen nimi.",
 "Error when creating the folder" => "Virhe kansiota luotaessa",
+"Unable to set upload directory." => "Lähetyskansion asettaminen epäonnistui.",
 "No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
 "There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:",
@@ -22,10 +24,12 @@ $TRANSLATIONS = array(
 "Failed to write to disk" => "Levylle kirjoitus epäonnistui",
 "Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
 "Upload failed. Could not find uploaded file" => "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
+"Upload failed. Could not get file info." => "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
 "Invalid directory." => "Virheellinen kansio.",
 "Files" => "Tiedostot",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua",
-"Not enough space available" => "Tilaa ei ole riittävästi",
+"Total file size {size1} exceeds upload limit {size2}" => "Yhteiskoko {size1} ylittää lähetysrajan {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
 "Upload cancelled." => "Lähetys peruttu.",
 "Could not get result from server." => "Tuloksien saaminen palvelimelta ei onnistunut.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
@@ -45,8 +49,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
 "{dirs} and {files}" => "{dirs} ja {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"),
-"'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
+"\"{name}\" is an invalid file name." => "\"{name}\" on virheellinen tiedostonimi.",
 "Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuina. Siirry henkilökohtaisiin asetuksiin avataksesi tiedostojesi salauksen.",
@@ -82,7 +85,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Lähetettävä tiedosto on liian suuri",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan.",
 "Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
-"Current scanning" => "Tämänhetkinen tutkinta",
-"Upgrading filesystem cache..." => "Päivitetään tiedostojärjestelmän välimuistia..."
+"Current scanning" => "Tämänhetkinen tutkinta"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 73b8943477..ad768f03de 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
 "Could not move %s" => "Impossible de déplacer %s",
 "File name cannot be empty." => "Le nom de fichier ne peut être vide.",
-"File name must not contain \"/\". Please choose a different name." => "Le nom de fichier ne doit pas contenir \"/\". Merci de choisir un nom différent.",
+"\"%s\" is an invalid file name." => "\"%s\" n'est pas un nom de fichier valide.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
+"The target folder has been moved or deleted." => "Le dossier cible a été déplacé ou supprimé.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Le nom %s est déjà utilisé dans le dossier %s. Merci de choisir un nom différent.",
 "Not a valid source" => "La source n'est pas valide",
 "Server is not allowed to open URLs, please check the server configuration" => "Le serveur n'est pas autorisé à ouvrir des URL, veuillez vérifier la configuration du serveur",
 "Error while downloading %s to %s" => "Erreur pendant le téléchargement de %s à %s",
 "Error when creating the file" => "Erreur pendant la création du fichier",
 "Folder name cannot be empty." => "Le nom de dossier ne peux pas être vide.",
-"Folder name must not contain \"/\". Please choose a different name." => "Le nom de dossier ne doit pas contenir \"/\". Merci de choisir un nom différent.",
 "Error when creating the folder" => "Erreur pendant la création du dossier",
 "Unable to set upload directory." => "Impossible de définir le dossier pour l'upload, charger.",
 "Invalid Token" => "Jeton non valide",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Absence de dossier temporaire.",
 "Failed to write to disk" => "Erreur d'écriture sur le disque",
 "Not enough storage available" => "Plus assez d'espace de stockage disponible",
-"Upload failed. Could not get file info." => "L'envoi a échoué. Impossible d'obtenir les informations du fichier.",
 "Upload failed. Could not find uploaded file" => "L'envoi a échoué. Impossible de trouver le fichier envoyé.",
+"Upload failed. Could not get file info." => "L'envoi a échoué. Impossible d'obtenir les informations du fichier.",
 "Invalid directory." => "Dossier invalide.",
 "Files" => "Fichiers",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle",
-"Not enough space available" => "Espace disponible insuffisant",
+"Total file size {size1} exceeds upload limit {size2}" => "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Espace insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
 "Upload cancelled." => "Envoi annulé.",
 "Could not get result from server." => "Ne peut recevoir les résultats du serveur.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n fichier","%n fichiers"),
 "{dirs} and {files}" => "{dirs} et {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Téléversement de %n fichier","Téléversement de %n fichiers"),
-"'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
+"\"{name}\" is an invalid file name." => "\"{name}\" n'est pas un nom de fichier valide.",
 "Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
 "Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "L'application de chiffrement est activée mais vos clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Téléversement trop volumineux",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur.",
 "Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
-"Current scanning" => "Analyse en cours",
-"Upgrading filesystem cache..." => "Mise à niveau du cache du système de fichier"
+"Current scanning" => "Analyse en cours"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 1d22691d93..7ea8181dc7 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Non foi posíbel mover %s; Xa existe un ficheiro con ese nome.",
 "Could not move %s" => "Non foi posíbel mover %s",
 "File name cannot be empty." => "O nome de ficheiro non pode estar baleiro",
-"File name must not contain \"/\". Please choose a different name." => "O nome do ficheiro non pode conter «/». Escolla outro nome.",
+"\"%s\" is an invalid file name." => "«%s» é un nome incorrecto de ficheiro.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».",
+"The target folder has been moved or deleted." => "O cartafol de destino foi movido ou eliminado.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Xa existe o nome %s no cartafol %s. Escolla outro nome.",
 "Not a valid source" => "Esta orixe non é correcta",
 "Server is not allowed to open URLs, please check the server configuration" => "O servidor non ten permisos para abrir os enderezos URL, comprobe a configuración do servidor",
 "Error while downloading %s to %s" => "Produciuse un erro ao descargar %s en %s",
 "Error when creating the file" => "Produciuse un erro ao crear o ficheiro",
 "Folder name cannot be empty." => "O nome de cartafol non pode estar baleiro.",
-"Folder name must not contain \"/\". Please choose a different name." => "O nome do cartafol non pode conter «/». Escolla outro nome.",
 "Error when creating the folder" => "Produciuse un erro ao crear o cartafol",
 "Unable to set upload directory." => "Non é posíbel configurar o directorio de envíos.",
 "Invalid Token" => "Marca incorrecta",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Falta o cartafol temporal",
 "Failed to write to disk" => "Produciuse un erro ao escribir no disco",
 "Not enough storage available" => "Non hai espazo de almacenamento abondo",
-"Upload failed. Could not get file info." => "O envío fracasou. Non foi posíbel obter información do ficheiro.",
 "Upload failed. Could not find uploaded file" => "O envío fracasou. Non foi posíbel atopar o ficheiro enviado",
+"Upload failed. Could not get file info." => "O envío fracasou. Non foi posíbel obter información do ficheiro.",
 "Invalid directory." => "O directorio é incorrecto.",
 "Files" => "Ficheiros",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes",
-"Not enough space available" => "O espazo dispoñíbel é insuficiente",
+"Total file size {size1} exceeds upload limit {size2}" => "O tamaño total do ficheiro {size1} excede do límite de envío {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}",
 "Upload cancelled." => "Envío cancelado.",
 "Could not get result from server." => "Non foi posíbel obter o resultado do servidor.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
 "{dirs} and {files}" => "{dirs} e {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Cargando %n ficheiro","Cargando %n ficheiros"),
-"'.' is an invalid file name." => "«.» é un nome de ficheiro incorrecto",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».",
+"\"{name}\" is an invalid file name." => "«{name}» é un nome incorrecto de ficheiro.",
 "Your storage is full, files can not be updated or synced anymore!" => "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "O aplicativo de cifrado está activado, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Envío demasiado grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor",
 "Files are being scanned, please wait." => "Estanse analizando os ficheiros. Agarde.",
-"Current scanning" => "Análise actual",
-"Upgrading filesystem cache..." => "Anovando a caché do sistema de ficheiros..."
+"Current scanning" => "Análise actual"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 0cdb178254..2035c8488b 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "לא ניתן להעביר את %s - קובץ בשם הזה כבר קיים",
 "Could not move %s" => "לא ניתן להעביר את %s",
 "File name cannot be empty." => "שם קובץ אינו יכול להיות ריק",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
 "No file was uploaded. Unknown error" => "לא הועלה קובץ. טעות בלתי מזוהה.",
 "There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:",
@@ -28,7 +29,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
 "Your storage is almost full ({usedSpacePercent}%)" => "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
 "Error" => "שגיאה",
 "Name" => "שם",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 22c3926ed1..6f5ba9b472 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -3,14 +3,13 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
 "Could not move %s" => "Nem sikerült %s áthelyezése",
 "File name cannot be empty." => "A fájlnév nem lehet semmi.",
-"File name must not contain \"/\". Please choose a different name." => "Az állomány neve nem tartalmazhatja a \"/\" karaktert. Kérem válasszon másik nevet!",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'",
 "The name %s is already used in the folder %s. Please choose a different name." => "A %s név már létezik a %s mappában. Kérem válasszon másik nevet!",
 "Not a valid source" => "A kiinduló állomány érvénytelen",
 "Server is not allowed to open URLs, please check the server configuration" => "A kiszolgálón nincs engedélyezve URL-ek megnyitása, kérem ellenőrizze a beállításokat",
 "Error while downloading %s to %s" => "Hiba történt miközben %s-t letöltöttük %s-be",
 "Error when creating the file" => "Hiba történt az állomány létrehozásakor",
 "Folder name cannot be empty." => "A mappa neve nem maradhat kitöltetlenül",
-"Folder name must not contain \"/\". Please choose a different name." => "A mappa neve nem tartalmazhatja a \"/\" karaktert. Kérem válasszon másik nevet!",
 "Error when creating the folder" => "Hiba történt a mappa létrehozásakor",
 "Unable to set upload directory." => "Nem található a mappa, ahova feltölteni szeretne.",
 "Invalid Token" => "Hibás mappacím",
@@ -23,12 +22,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Hiányzik egy ideiglenes mappa",
 "Failed to write to disk" => "Nem sikerült a lemezre történő írás",
 "Not enough storage available" => "Nincs elég szabad hely.",
-"Upload failed. Could not get file info." => "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.",
 "Upload failed. Could not find uploaded file" => "A feltöltés nem sikerült. Nem található a feltöltendő állomány.",
+"Upload failed. Could not get file info." => "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.",
 "Invalid directory." => "Érvénytelen mappa.",
 "Files" => "Fájlok",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.",
-"Not enough space available" => "Nincs elég szabad hely",
 "Upload cancelled." => "A feltöltést megszakítottuk.",
 "Could not get result from server." => "A kiszolgálótól nem kapható meg az eredmény.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
@@ -50,8 +48,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n állomány","%n állomány"),
 "{dirs} and {files}" => "{dirs} és {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n állomány feltöltése","%n állomány feltöltése"),
-"'.' is an invalid file name." => "'.' fájlnév érvénytelen.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'",
 "Your storage is full, files can not be updated or synced anymore!" => "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.",
 "Your storage is almost full ({usedSpacePercent}%)" => "A tároló majdnem tele van ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!",
@@ -89,7 +85,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "A feltöltés túl nagy",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet.",
 "Files are being scanned, please wait." => "A fájllista ellenőrzése zajlik, kis türelmet!",
-"Current scanning" => "Ellenőrzés alatt",
-"Upgrading filesystem cache..." => "A fájlrendszer gyorsítótárának frissítése zajlik..."
+"Current scanning" => "Ellenőrzés alatt"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 4e254ff6f6..45bc05c918 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -3,13 +3,12 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
 "Could not move %s" => "Tidak dapat memindahkan %s",
 "File name cannot be empty." => "Nama berkas tidak boleh kosong.",
-"File name must not contain \"/\". Please choose a different name." => "Nama berkas tidak boleh mengandung \"/\". Silakan pilih nama yang berbeda.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.",
 "Not a valid source" => "Sumber tidak sah",
 "Error while downloading %s to %s" => "Galat saat mengunduh %s ke %s",
 "Error when creating the file" => "Galat saat membuat berkas",
 "Folder name cannot be empty." => "Nama folder tidak bolh kosong.",
-"Folder name must not contain \"/\". Please choose a different name." => "Nama folder tidak boleh mengandung \"/\". Silakan pilih nama yang berbeda.",
 "Error when creating the folder" => "Galat saat membuat folder",
 "Unable to set upload directory." => "Tidak dapat mengatur folder unggah",
 "Invalid Token" => "Token tidak sah",
@@ -22,12 +21,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Folder sementara tidak ada",
 "Failed to write to disk" => "Gagal menulis ke disk",
 "Not enough storage available" => "Ruang penyimpanan tidak mencukupi",
-"Upload failed. Could not get file info." => "Unggah gagal. Tidak mendapatkan informasi berkas.",
 "Upload failed. Could not find uploaded file" => "Unggah gagal. Tidak menemukan berkas yang akan diunggah",
+"Upload failed. Could not get file info." => "Unggah gagal. Tidak mendapatkan informasi berkas.",
 "Invalid directory." => "Direktori tidak valid.",
 "Files" => "Berkas",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte",
-"Not enough space available" => "Ruang penyimpanan tidak mencukupi",
 "Upload cancelled." => "Pengunggahan dibatalkan.",
 "Could not get result from server." => "Tidak mendapatkan hasil dari server.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
@@ -48,8 +46,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n berkas"),
 "{dirs} and {files}" => "{dirs} dan {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Mengunggah %n berkas"),
-"'.' is an invalid file name." => "'.' bukan nama berkas yang valid.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi",
@@ -87,7 +83,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Yang diunggah terlalu besar",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini.",
 "Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
-"Current scanning" => "Yang sedang dipindai",
-"Upgrading filesystem cache..." => "Meningkatkan tembolok sistem berkas..."
+"Current scanning" => "Yang sedang dipindai"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 5c5cc7d5d7..088cdefa30 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Gat ekki fært %s - Skrá með þessu nafni er þegar til",
 "Could not move %s" => "Gat ekki fært %s",
 "File name cannot be empty." => "Nafn skráar má ekki vera tómt",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
 "No file was uploaded. Unknown error" => "Engin skrá var send inn. Óþekkt villa.",
 "There is no error, the file uploaded with success" => "Engin villa, innsending heppnaðist",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Innsend skrá er stærri en upload_max stillingin í php.ini:",
@@ -13,7 +14,6 @@ $TRANSLATIONS = array(
 "Failed to write to disk" => "Tókst ekki að skrifa á disk",
 "Invalid directory." => "Ógild mappa.",
 "Files" => "Skrár",
-"Not enough space available" => "Ekki nægt pláss tiltækt",
 "Upload cancelled." => "Hætt við innsendingu.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast.",
 "{new_name} already exists" => "{new_name} er þegar til",
@@ -25,8 +25,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"'.' is an invalid file name." => "'.' er ekki leyfilegt nafn.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
 "Error" => "Villa",
 "Name" => "Nafn",
 "Size" => "Stærð",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 2a10e9977f..e1a34e646f 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossibile spostare %s - un file con questo nome esiste già",
 "Could not move %s" => "Impossibile spostare %s",
 "File name cannot be empty." => "Il nome del file non può essere vuoto.",
-"File name must not contain \"/\". Please choose a different name." => "Il nome del file non può contenere il carattere \"/\". Scegli un nome diverso.",
+"\"%s\" is an invalid file name." => "\"%s\" non è un nome file valido.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
+"The target folder has been moved or deleted." => "La cartella di destinazione è stata spostata o eliminata.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Il nome %s è attualmente in uso nella cartella %s. Scegli un nome diverso.",
 "Not a valid source" => "Non è una sorgente valida",
 "Server is not allowed to open URLs, please check the server configuration" => "Al server non è permesso aprire URL, controlla la configurazione del server",
 "Error while downloading %s to %s" => "Errore durante lo scaricamento di %s su %s",
 "Error when creating the file" => "Errore durante la creazione del file",
 "Folder name cannot be empty." => "Il nome della cartella non può essere vuoto.",
-"Folder name must not contain \"/\". Please choose a different name." => "Il nome della cartella non può contenere il carattere \"/\". Scegli un nome diverso.",
 "Error when creating the folder" => "Errore durante la creazione della cartella",
 "Unable to set upload directory." => "Impossibile impostare una cartella di caricamento.",
 "Invalid Token" => "Token non valido",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Manca una cartella temporanea",
 "Failed to write to disk" => "Scrittura su disco non riuscita",
 "Not enough storage available" => "Spazio di archiviazione insufficiente",
-"Upload failed. Could not get file info." => "Caricamento non riuscito. Impossibile ottenere informazioni sul file.",
 "Upload failed. Could not find uploaded file" => "Caricamento non riuscito. Impossibile trovare il file caricato.",
+"Upload failed. Could not get file info." => "Caricamento non riuscito. Impossibile ottenere informazioni sul file.",
 "Invalid directory." => "Cartella non valida.",
 "Files" => "File",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.",
-"Not enough space available" => "Spazio disponibile insufficiente",
+"Total file size {size1} exceeds upload limit {size2}" => "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
 "Upload cancelled." => "Invio annullato",
 "Could not get result from server." => "Impossibile ottenere il risultato dal server.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n file","%n file"),
 "{dirs} and {files}" => "{dirs} e {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"),
-"'.' is an invalid file name." => "'.' non è un nome file valido.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
+"\"{name}\" is an invalid file name." => "\"{name}\" non è un nome file valido.",
 "Your storage is full, files can not be updated or synced anymore!" => "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Caricamento troppo grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "I file che stai provando a caricare superano la dimensione massima consentita su questo server.",
 "Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
-"Current scanning" => "Scansione corrente",
-"Upgrading filesystem cache..." => "Aggiornamento della cache del filesystem in corso..."
+"Current scanning" => "Scansione corrente"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ja.php b/apps/files/l10n/ja.php
new file mode 100644
index 0000000000..eb6cb0efc5
--- /dev/null
+++ b/apps/files/l10n/ja.php
@@ -0,0 +1,95 @@
+<?php
+$TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "%s を移動できませんでした ― この名前のファイルはすでに存在します",
+"Could not move %s" => "%s を移動できませんでした",
+"File name cannot be empty." => "ファイル名を空にすることはできません。",
+"\"%s\" is an invalid file name." => "\"%s\" は無効なファイル名です。",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
+"The target folder has been moved or deleted." => "目標のフォルダは移動されたか、削除されました。",
+"The name %s is already used in the folder %s. Please choose a different name." => "%s はフォルダー %s ですでに使われています。別の名前を選択してください。",
+"Not a valid source" => "有効なソースではありません",
+"Server is not allowed to open URLs, please check the server configuration" => "サーバーは、URLを開くことは許されません。サーバーの設定をチェックしてください。",
+"Error while downloading %s to %s" => "%s から %s へのダウンロードエラー",
+"Error when creating the file" => "ファイルの生成エラー",
+"Folder name cannot be empty." => "フォルダー名は空にできません",
+"Error when creating the folder" => "フォルダーの生成エラー",
+"Unable to set upload directory." => "アップロードディレクトリを設定できません。",
+"Invalid Token" => "無効なトークン",
+"No file was uploaded. Unknown error" => "ファイルは何もアップロードされていません。不明なエラー",
+"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
+"The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
+"No file was uploaded" => "ファイルはアップロードされませんでした",
+"Missing a temporary folder" => "一時保存フォルダーが見つかりません",
+"Failed to write to disk" => "ディスクへの書き込みに失敗しました",
+"Not enough storage available" => "ストレージに十分な空き容量がありません",
+"Upload failed. Could not find uploaded file" => "アップロードに失敗。アップロード済みのファイルを見つけることができませんでした。",
+"Upload failed. Could not get file info." => "アップロードに失敗。ファイル情報を取得できませんでした。",
+"Invalid directory." => "無効なディレクトリです。",
+"Files" => "ファイル",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのため {filename} をアップロードできません",
+"Total file size {size1} exceeds upload limit {size2}" => "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。",
+"Upload cancelled." => "アップロードはキャンセルされました。",
+"Could not get result from server." => "サーバーから結果を取得できませんでした。",
+"File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
+"URL cannot be empty" => "URL は空にできません",
+"In the home folder 'Shared' is a reserved filename" => "ホームフォルダーでは、'Shared' はシステムが使用する予約済みのファイル名です",
+"{new_name} already exists" => "{new_name} はすでに存在します",
+"Could not create file" => "ファイルを作成できませんでした",
+"Could not create folder" => "フォルダーを作成できませんでした",
+"Error fetching URL" => "URL取得エラー",
+"Share" => "共有",
+"Delete permanently" => "完全に削除する",
+"Rename" => "名前の変更",
+"Pending" => "中断",
+"Could not rename file" => "ファイルの名前変更ができませんでした",
+"replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
+"undo" => "元に戻す",
+"Error deleting file." => "ファイルの削除エラー。",
+"_%n folder_::_%n folders_" => array("%n 個のフォルダー"),
+"_%n file_::_%n files_" => array("%n 個のファイル"),
+"{dirs} and {files}" => "{dirs} と {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"),
+"\"{name}\" is an invalid file name." => "\"{name}\" は無効なファイル名です。",
+"Your storage is full, files can not be updated or synced anymore!" => "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
+"Your storage is almost full ({usedSpacePercent}%)" => "ストレージがほぼ一杯です（{usedSpacePercent}%）",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
+"Your download is being prepared. This might take some time if the files are big." => "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。",
+"Error moving file" => "ファイルの移動エラー",
+"Error" => "エラー",
+"Name" => "名前",
+"Size" => "サイズ",
+"Modified" => "更新日時",
+"Invalid folder name. Usage of 'Shared' is reserved." => "無効なフォルダー名。「Shared」の利用は予約されています。",
+"%s could not be renamed" => "%sの名前を変更できませんでした",
+"Upload" => "アップロード",
+"File handling" => "ファイル操作",
+"Maximum upload size" => "最大アップロードサイズ",
+"max. possible: " => "最大容量: ",
+"Needed for multi-file and folder downloads." => "複数ファイルおよびフォルダーのダウンロードに必要",
+"Enable ZIP-download" => "ZIP形式のダウンロードを有効にする",
+"0 is unlimited" => "0を指定した場合は無制限",
+"Maximum input size for ZIP files" => "ZIPファイルでの最大入力サイズ",
+"Save" => "保存",
+"New" => "新規作成",
+"New text file" => "新規のテキストファイル作成",
+"Text file" => "テキストファイル",
+"New folder" => "新しいフォルダー",
+"Folder" => "フォルダー",
+"From link" => "リンク",
+"Deleted files" => "ゴミ箱",
+"Cancel upload" => "アップロードをキャンセル",
+"You don’t have permission to upload or create files here" => "ここにファイルをアップロードもしくは作成する権限がありません",
+"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
+"Download" => "ダウンロード",
+"Delete" => "削除",
+"Upload too large" => "アップロードには大きすぎます。",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
+"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
+"Current scanning" => "スキャン中"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 8019b825d3..8a4b3ca877 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -3,16 +3,17 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s を移動できませんでした ― この名前のファイルはすでに存在します",
 "Could not move %s" => "%s を移動できませんでした",
 "File name cannot be empty." => "ファイル名を空にすることはできません。",
-"File name must not contain \"/\". Please choose a different name." => "ファイル名には \"/\" を含めることはできません。別の名前を選択してください。",
-"The name %s is already used in the folder %s. Please choose a different name." => "%s はフォルダ %s ないですでに使われています。別の名前を選択してください。",
+"\"%s\" is an invalid file name." => "\"%s\" は無効なファイル名です。",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
+"The target folder has been moved or deleted." => "目標のフォルダは移動されたか、削除されました。",
+"The name %s is already used in the folder %s. Please choose a different name." => "%s はフォルダー %s ですでに使われています。別の名前を選択してください。",
 "Not a valid source" => "有効なソースではありません",
 "Server is not allowed to open URLs, please check the server configuration" => "サーバーは、URLを開くことは許されません。サーバーの設定をチェックしてください。",
 "Error while downloading %s to %s" => "%s から %s へのダウンロードエラー",
 "Error when creating the file" => "ファイルの生成エラー",
-"Folder name cannot be empty." => "フォルダ名は空にできません",
-"Folder name must not contain \"/\". Please choose a different name." => "フォルダ名には \"/\" を含めることはできません。別の名前を選択してください。",
-"Error when creating the folder" => "フォルダの生成エラー",
-"Unable to set upload directory." => "アップロードディレクトリを設定出来ません。",
+"Folder name cannot be empty." => "フォルダー名は空にできません",
+"Error when creating the folder" => "フォルダーの生成エラー",
+"Unable to set upload directory." => "アップロードディレクトリを設定できません。",
 "Invalid Token" => "無効なトークン",
 "No file was uploaded. Unknown error" => "ファイルは何もアップロードされていません。不明なエラー",
 "There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
@@ -20,23 +21,24 @@ $TRANSLATIONS = array(
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
 "The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
 "No file was uploaded" => "ファイルはアップロードされませんでした",
-"Missing a temporary folder" => "一時保存フォルダが見つかりません",
+"Missing a temporary folder" => "一時保存フォルダーが見つかりません",
 "Failed to write to disk" => "ディスクへの書き込みに失敗しました",
 "Not enough storage available" => "ストレージに十分な空き容量がありません",
-"Upload failed. Could not get file info." => "アップロードに失敗。ファイル情報を取得できませんでした。",
 "Upload failed. Could not find uploaded file" => "アップロードに失敗。アップロード済みのファイルを見つけることができませんでした。",
+"Upload failed. Could not get file info." => "アップロードに失敗。ファイル情報を取得できませんでした。",
 "Invalid directory." => "無効なディレクトリです。",
 "Files" => "ファイル",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのため {filename} をアップロードできません",
-"Not enough space available" => "利用可能なスペースが十分にありません",
+"Total file size {size1} exceeds upload limit {size2}" => "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。",
 "Upload cancelled." => "アップロードはキャンセルされました。",
-"Could not get result from server." => "サーバから結果を取得できませんでした。",
+"Could not get result from server." => "サーバーから結果を取得できませんでした。",
 "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
 "URL cannot be empty" => "URL は空にできません",
-"In the home folder 'Shared' is a reserved filename" => "ホームフォルダでは、'Shared' はシステムが使用する予約済みのファイル名です",
-"{new_name} already exists" => "{new_name} はすでに存在しています",
+"In the home folder 'Shared' is a reserved filename" => "ホームフォルダーでは、'Shared' はシステムが使用する予約済みのファイル名です",
+"{new_name} already exists" => "{new_name} はすでに存在します",
 "Could not create file" => "ファイルを作成できませんでした",
-"Could not create folder" => "フォルダを作成できませんでした",
+"Could not create folder" => "フォルダーを作成できませんでした",
 "Error fetching URL" => "URL取得エラー",
 "Share" => "共有",
 "Delete permanently" => "完全に削除する",
@@ -46,14 +48,13 @@ $TRANSLATIONS = array(
 "replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
 "undo" => "元に戻す",
 "Error deleting file." => "ファイルの削除エラー。",
-"_%n folder_::_%n folders_" => array("%n 個のフォルダ"),
+"_%n folder_::_%n folders_" => array("%n 個のフォルダー"),
 "_%n file_::_%n files_" => array("%n 個のファイル"),
 "{dirs} and {files}" => "{dirs} と {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"),
-"'.' is an invalid file name." => "'.' は無効なファイル名です。",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
+"\"{name}\" is an invalid file name." => "\"{name}\" は無効なファイル名です。",
 "Your storage is full, files can not be updated or synced anymore!" => "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
-"Your storage is almost full ({usedSpacePercent}%)" => "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）",
+"Your storage is almost full ({usedSpacePercent}%)" => "ストレージがほぼ一杯です（{usedSpacePercent}%）",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
@@ -63,22 +64,22 @@ $TRANSLATIONS = array(
 "Name" => "名前",
 "Size" => "サイズ",
 "Modified" => "更新日時",
-"Invalid folder name. Usage of 'Shared' is reserved." => "無効なフォルダ名。「Shared」の利用は予約されています。",
+"Invalid folder name. Usage of 'Shared' is reserved." => "無効なフォルダー名。「Shared」の利用は予約されています。",
 "%s could not be renamed" => "%sの名前を変更できませんでした",
 "Upload" => "アップロード",
 "File handling" => "ファイル操作",
 "Maximum upload size" => "最大アップロードサイズ",
 "max. possible: " => "最大容量: ",
-"Needed for multi-file and folder downloads." => "複数ファイルおよびフォルダのダウンロードに必要",
+"Needed for multi-file and folder downloads." => "複数ファイルおよびフォルダーのダウンロードに必要",
 "Enable ZIP-download" => "ZIP形式のダウンロードを有効にする",
 "0 is unlimited" => "0を指定した場合は無制限",
-"Maximum input size for ZIP files" => "ZIPファイルへの最大入力サイズ",
+"Maximum input size for ZIP files" => "ZIPファイルでの最大入力サイズ",
 "Save" => "保存",
 "New" => "新規作成",
 "New text file" => "新規のテキストファイル作成",
 "Text file" => "テキストファイル",
-"New folder" => "新しいフォルダ",
-"Folder" => "フォルダ",
+"New folder" => "新しいフォルダー",
+"Folder" => "フォルダー",
 "From link" => "リンク",
 "Deleted files" => "ゴミ箱",
 "Cancel upload" => "アップロードをキャンセル",
@@ -87,7 +88,7 @@ $TRANSLATIONS = array(
 "Download" => "ダウンロード",
 "Delete" => "削除",
 "Upload too large" => "アップロードには大きすぎます。",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
 "Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
 "Current scanning" => "スキャン中",
 "Upgrading filesystem cache..." => "ファイルシステムキャッシュを更新中..."
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index eafa0c083f..230c2e4ede 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s –ის გადატანა ვერ მოხერხდა – ფაილი ამ სახელით უკვე არსებობს",
 "Could not move %s" => "%s –ის გადატანა ვერ მოხერხდა",
 "File name cannot be empty." => "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და  '*' არ არის დაიშვებული.",
 "No file was uploaded. Unknown error" => "ფაილი არ აიტვირთა. უცნობი შეცდომა",
 "There is no error, the file uploaded with success" => "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში",
@@ -14,7 +15,6 @@ $TRANSLATIONS = array(
 "Not enough storage available" => "საცავში საკმარისი ადგილი არ არის",
 "Invalid directory." => "დაუშვებელი დირექტორია.",
 "Files" => "ფაილები",
-"Not enough space available" => "საკმარისი ადგილი არ არის",
 "Upload cancelled." => "ატვირთვა შეჩერებულ იქნა.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
 "{new_name} already exists" => "{new_name} უკვე არსებობს",
@@ -27,8 +27,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
-"'.' is an invalid file name." => "'.' არის დაუშვებელი ფაილის სახელი.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და  '*' არ არის დაიშვებული.",
 "Your storage is full, files can not be updated or synced anymore!" => "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
 "Your storage is almost full ({usedSpacePercent}%)" => "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის.",
@@ -58,7 +56,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "ასატვირთი ფაილი ძალიან დიდია",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",
 "Files are being scanned, please wait." => "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ.",
-"Current scanning" => "მიმდინარე სკანირება",
-"Upgrading filesystem cache..." => "ფაილური სისტემის ქეშის განახლება...."
+"Current scanning" => "მიმდინარე სკანირება"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/km.php b/apps/files/l10n/km.php
index 9733358d62..702c811ecf 100644
--- a/apps/files/l10n/km.php
+++ b/apps/files/l10n/km.php
@@ -1,8 +1,19 @@
 <?php
 $TRANSLATIONS = array(
+"Files" => "ឯកសារ",
+"Share" => "ចែក​រំលែក",
+"undo" => "មិន​ធ្វើ​វិញ",
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
+"Error" => "កំហុស",
+"Name" => "ឈ្មោះ",
+"Size" => "ទំហំ",
+"Upload" => "ផ្ទុក​ឡើង",
+"Save" => "រក្សាទុក",
+"New folder" => "ថត​ថ្មី",
+"Folder" => "ថត",
+"Download" => "ទាញយក",
 "Delete" => "លុប"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 35a9f2fb85..92a2578074 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -3,14 +3,13 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "항목 %s을(를) 이동시킬 수 없음 - 같은 이름의 파일이 이미 존재함",
 "Could not move %s" => "항목 %s을(를) 이동시킬 수 없음",
 "File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.",
-"File name must not contain \"/\". Please choose a different name." => "파일 이름에는 \"/\"가 들어갈 수 없습니다. 다른 이름을 사용하십시오.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
 "The name %s is already used in the folder %s. Please choose a different name." => "이름 %s이(가) 폴더 %s에서 이미 사용 중입니다. 다른 이름을 사용하십시오.",
 "Not a valid source" => "올바르지 않은 원본",
 "Server is not allowed to open URLs, please check the server configuration" => "서버에서 URL을 열 수 없습니다. 서버 설정을 확인하십시오",
 "Error while downloading %s to %s" => "%s을(를) %s(으)로 다운로드하는 중 오류 발생",
 "Error when creating the file" => "파일 생성 중 오류 발생",
 "Folder name cannot be empty." => "폴더 이름이 비어있을 수 없습니다.",
-"Folder name must not contain \"/\". Please choose a different name." => "폴더 이름에는 \"/\"가 들어갈 수 없습니다. 다른 이름을 사용하십시오.",
 "Error when creating the folder" => "폴더 생성 중 오류 발생",
 "Unable to set upload directory." => "업로드 디렉터리를 설정할 수 없습니다.",
 "Invalid Token" => "잘못된 토큰",
@@ -23,12 +22,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "임시 폴더가 없음",
 "Failed to write to disk" => "디스크에 쓰지 못했습니다",
 "Not enough storage available" => "저장소가 용량이 충분하지 않습니다.",
-"Upload failed. Could not get file info." => "업로드에 실패했습니다. 파일 정보를 가져올 수 없습니다.",
 "Upload failed. Could not find uploaded file" => "업로드에 실패했습니다. 업로드할 파일을 찾을 수 없습니다",
+"Upload failed. Could not get file info." => "업로드에 실패했습니다. 파일 정보를 가져올 수 없습니다.",
 "Invalid directory." => "올바르지 않은 디렉터리입니다.",
 "Files" => "파일",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.",
-"Not enough space available" => "여유 공간이 부족합니다",
 "Upload cancelled." => "업로드가 취소되었습니다.",
 "Could not get result from server." => "서버에서 결과를 가져올 수 없습니다.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
@@ -50,8 +48,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("파일 %n개"),
 "{dirs} and {files}" => "{dirs} 그리고 {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("파일 %n개 업로드 중"),
-"'.' is an invalid file name." => "'.' 는 올바르지 않은 파일 이름입니다.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
 "Your storage is full, files can not be updated or synced anymore!" => "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!",
 "Your storage is almost full ({usedSpacePercent}%)" => "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
@@ -89,7 +85,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "업로드한 파일이 너무 큼",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
 "Files are being scanned, please wait." => "파일을 검색하고 있습니다. 기다려 주십시오.",
-"Current scanning" => "현재 검색",
-"Upgrading filesystem cache..." => "파일 시스템 캐시 업그레이드 중..."
+"Current scanning" => "현재 검색"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index f04e9ec44d..c0141656f5 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Files" => "په‌ڕگەکان",
 "Share" => "هاوبەشی کردن",
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index d902365863..14c4862117 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -3,13 +3,13 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja",
 "Could not move %s" => "Nepavyko perkelti %s",
 "File name cannot be empty." => "Failo pavadinimas negali būti tuščias.",
-"File name must not contain \"/\". Please choose a different name." => "Failo pavadinime negali būti simbolio \"/\". Prašome pasirinkti kitokį pavadinimą.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Pavadinimas %s jau naudojamas aplanke %s. Prašome pasirinkti kitokį pavadinimą.",
 "Not a valid source" => "Netinkamas šaltinis",
+"Server is not allowed to open URLs, please check the server configuration" => "Serveriui neleidžiama atverti URL, prašome patikrinti serverio konfigūraciją",
 "Error while downloading %s to %s" => "Klaida siunčiant %s į %s",
 "Error when creating the file" => "Klaida kuriant failą",
 "Folder name cannot be empty." => "Aplanko pavadinimas negali būti tuščias.",
-"Folder name must not contain \"/\". Please choose a different name." => "Aplanko pavadinime negali būti simbolio \"/\". Prašome pasirinkti kitokį pavadinimą.",
 "Error when creating the folder" => "Klaida kuriant aplanką",
 "Unable to set upload directory." => "Nepavyksta nustatyti įkėlimų katalogo.",
 "Invalid Token" => "Netinkamas ženklas",
@@ -22,19 +22,20 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Nėra laikinojo katalogo",
 "Failed to write to disk" => "Nepavyko įrašyti į diską",
 "Not enough storage available" => "Nepakanka vietos serveryje",
-"Upload failed. Could not get file info." => "Įkėlimas nepavyko. Nepavyko gauti failo informacijos.",
 "Upload failed. Could not find uploaded file" => "Įkėlimas nepavyko. Nepavyko rasti įkelto failo",
+"Upload failed. Could not get file info." => "Įkėlimas nepavyko. Nepavyko gauti failo informacijos.",
 "Invalid directory." => "Neteisingas aplankas",
 "Files" => "Failai",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio",
-"Not enough space available" => "Nepakanka vietos",
 "Upload cancelled." => "Įkėlimas atšauktas.",
 "Could not get result from server." => "Nepavyko gauti rezultato iš serverio.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
 "URL cannot be empty" => "URL negali būti tuščias.",
+"In the home folder 'Shared' is a reserved filename" => "Pradiniame aplanke failo pavadinimas „Shared“ yra rezervuotas",
 "{new_name} already exists" => "{new_name} jau egzistuoja",
 "Could not create file" => "Neįmanoma sukurti failo",
 "Could not create folder" => "Neįmanoma sukurti aplanko",
+"Error fetching URL" => "Klauda gaunant URL",
 "Share" => "Dalintis",
 "Delete permanently" => "Ištrinti negrįžtamai",
 "Rename" => "Pervadinti",
@@ -47,8 +48,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n failas","%n failai","%n failų"),
 "{dirs} and {files}" => "{dirs} ir {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"),
-"'.' is an invalid file name." => "'.' yra neleidžiamas failo pavadinime.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.",
 "Your storage is full, files can not be updated or synced anymore!" => "Jūsų visa vieta serveryje užimta",
 "Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti",
@@ -60,6 +59,7 @@ $TRANSLATIONS = array(
 "Name" => "Pavadinimas",
 "Size" => "Dydis",
 "Modified" => "Pakeista",
+"Invalid folder name. Usage of 'Shared' is reserved." => "Netinkamas aplanko pavadinimas. „Shared“ pavadinimas yra rezervuotas.",
 "%s could not be renamed" => "%s negali būti pervadintas",
 "Upload" => "Įkelti",
 "File handling" => "Failų tvarkymas",
@@ -71,6 +71,7 @@ $TRANSLATIONS = array(
 "Maximum input size for ZIP files" => "Maksimalus ZIP archyvo failo dydis",
 "Save" => "Išsaugoti",
 "New" => "Naujas",
+"New text file" => "Naujas tekstinis failas",
 "Text file" => "Teksto failas",
 "New folder" => "Naujas aplankas",
 "Folder" => "Katalogas",
@@ -84,7 +85,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Įkėlimui failas per didelis",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje",
 "Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
-"Current scanning" => "Šiuo metu skenuojama",
-"Upgrading filesystem cache..." => "Atnaujinamas sistemos kešavimas..."
+"Current scanning" => "Šiuo metu skenuojama"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 7f8975b294..0d2ebf281a 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
 "Could not move %s" => "Nevarēja pārvietot %s",
 "File name cannot be empty." => "Datnes nosaukums nevar būt tukšs.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
 "Unable to set upload directory." => "Nevar uzstādīt augšupielādes mapi.",
 "Invalid Token" => "Nepareiza pilnvara",
 "No file was uploaded. Unknown error" => "Netika augšupielādēta neviena datne. Nezināma kļūda",
@@ -16,7 +17,6 @@ $TRANSLATIONS = array(
 "Not enough storage available" => "Nav pietiekami daudz vietas",
 "Invalid directory." => "Nederīga direktorija.",
 "Files" => "Datnes",
-"Not enough space available" => "Nepietiek brīvas vietas",
 "Upload cancelled." => "Augšupielāde ir atcelta.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
 "{new_name} already exists" => "{new_name} jau eksistē",
@@ -29,8 +29,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
 "_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
 "_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"),
-"'.' is an invalid file name." => "'.' ir nederīgs datnes nosaukums.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
 "Your storage is full, files can not be updated or synced anymore!" => "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.",
@@ -62,7 +60,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Datne ir par lielu, lai to augšupielādētu",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu",
 "Files are being scanned, please wait." => "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet.",
-"Current scanning" => "Šobrīd tiek caurskatīts",
-"Upgrading filesystem cache..." => "Uzlabo datņu sistēmas kešatmiņu..."
+"Current scanning" => "Šobrīd tiek caurskatīts"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index fadf5efc07..bc9ee15823 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -3,11 +3,11 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Не можам да го преместам %s - Датотека со такво име веќе постои",
 "Could not move %s" => "Не можам да ги префрлам %s",
 "File name cannot be empty." => "Името на датотеката не може да биде празно.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
 "Not a valid source" => "Не е валиден извор",
 "Error while downloading %s to %s" => "Грешка додека преземам %s to %s",
 "Error when creating the file" => "Грешка при креирање на датотека",
 "Folder name cannot be empty." => "Името на папката не може да биде празно.",
-"Folder name must not contain \"/\". Please choose a different name." => "Името на папката не смее да содржи \"/\". Одберете друго име.",
 "Error when creating the folder" => "Грешка при креирање на папка",
 "Unable to set upload directory." => "Не може да се постави папката за префрлање на податоци.",
 "Invalid Token" => "Грешен токен",
@@ -23,7 +23,6 @@ $TRANSLATIONS = array(
 "Upload failed. Could not find uploaded file" => "Префрлањето е неуспешно. Не можам да го најдам префрлената датотека.",
 "Invalid directory." => "Погрешна папка.",
 "Files" => "Датотеки",
-"Not enough space available" => "Немате доволно дисков простор",
 "Upload cancelled." => "Преземањето е прекинато.",
 "Could not get result from server." => "Не можам да добијам резултат од серверот.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
@@ -43,8 +42,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("",""),
 "{dirs} and {files}" => "{dirs} и {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"'.' is an invalid file name." => "'.' е грешно име за датотека.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
 "Your storage is full, files can not be updated or synced anymore!" => "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Вашиот сториџ е скоро полн ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Вашето преземање се подготвува. Ова може да потрае до колку датотеките се големи.",
@@ -75,7 +72,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Фајлот кој се вчитува е преголем",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
 "Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
-"Current scanning" => "Моментално скенирам",
-"Upgrading filesystem cache..." => "Го надградувам кешот на фјал системот..."
+"Current scanning" => "Моментално скенирам"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files/l10n/ml.php b/apps/files/l10n/ml.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/ml.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/mn.php b/apps/files/l10n/mn.php
new file mode 100644
index 0000000000..0157af093e
--- /dev/null
+++ b/apps/files/l10n/mn.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array("",""),
+"_%n file_::_%n files_" => array("",""),
+"_Uploading %n file_::_Uploading %n files_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index ebd7ef3899..b90bee38f9 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -3,6 +3,14 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
 "Could not move %s" => "Kunne ikke flytte %s",
 "File name cannot be empty." => "Filnavn kan ikke være tomt.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
+"The name %s is already used in the folder %s. Please choose a different name." => "Navnet %s brukes allerede i mappen %s. Velg et annet navn.",
+"Not a valid source" => "Ikke en gyldig kilde",
+"Server is not allowed to open URLs, please check the server configuration" => "Serveren har ikke lov til å åpne URL-er. Sjekk konfigurasjon av server",
+"Error while downloading %s to %s" => "Feil ved nedlasting av %s til %s",
+"Error when creating the file" => "Feil ved oppretting av filen",
+"Folder name cannot be empty." => "Mappenavn kan ikke være tomt.",
+"Error when creating the folder" => "Feil ved oppretting av mappen",
 "Unable to set upload directory." => "Kunne ikke sette opplastingskatalog.",
 "Invalid Token" => "Ugyldig nøkkel",
 "No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
@@ -14,30 +22,44 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Mangler midlertidig mappe",
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
 "Not enough storage available" => "Ikke nok lagringsplass",
+"Upload failed. Could not find uploaded file" => "Opplasting feilet. Fant ikke opplastet fil.",
+"Upload failed. Could not get file info." => "Opplasting feilet. Klarte ikke å finne informasjon om fil.",
 "Invalid directory." => "Ugyldig katalog.",
 "Files" => "Filer",
-"Not enough space available" => "Ikke nok lagringsplass",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes",
 "Upload cancelled." => "Opplasting avbrutt.",
+"Could not get result from server." => "Fikk ikke resultat fra serveren.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
+"URL cannot be empty" => "URL kan ikke være tom",
+"In the home folder 'Shared' is a reserved filename" => "I hjemmemappen er 'Shared' et reservert filnavn",
 "{new_name} already exists" => "{new_name} finnes allerede",
+"Could not create file" => "Klarte ikke å opprette fil",
+"Could not create folder" => "Klarte ikke å opprette mappe",
+"Error fetching URL" => "Feil ved henting av URL",
 "Share" => "Del",
 "Delete permanently" => "Slett permanent",
 "Rename" => "Gi nytt navn",
 "Pending" => "Ventende",
+"Could not rename file" => "Klarte ikke å gi nytt navn til fil",
 "replaced {new_name} with {old_name}" => "erstattet {new_name} med {old_name}",
 "undo" => "angre",
+"Error deleting file." => "Feil ved sletting av fil.",
 "_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
 "_%n file_::_%n files_" => array("%n fil","%n filer"),
+"{dirs} and {files}" => "{dirs} og {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Laster opp %n fil","Laster opp %n filer"),
-"'.' is an invalid file name." => "'.' er et ugyldig filnavn.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
 "Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine.",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
 "Your download is being prepared. This might take some time if the files are big." => "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid.",
+"Error moving file" => "Feil ved flytting av fil",
 "Error" => "Feil",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
+"Invalid folder name. Usage of 'Shared' is reserved." => "Ulovlig mappenavn. Bruken av 'Shared' er reservert.",
 "%s could not be renamed" => "Kunne ikke gi nytt navn til %s",
 "Upload" => "Last opp",
 "File handling" => "Filhåndtering",
@@ -49,19 +71,20 @@ $TRANSLATIONS = array(
 "Maximum input size for ZIP files" => "Maksimal størrelse på ZIP-filer",
 "Save" => "Lagre",
 "New" => "Ny",
+"New text file" => "Ny tekstfil",
 "Text file" => "Tekstfil",
 "New folder" => "Ny mappe",
 "Folder" => "Mappe",
 "From link" => "Fra link",
-"Deleted files" => "Slettet filer",
+"Deleted files" => "Slettede filer",
 "Cancel upload" => "Avbryt opplasting",
+"You don’t have permission to upload or create files here" => "Du har ikke tillatelse til å laste opp eller opprette filer her",
 "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
 "Download" => "Last ned",
 "Delete" => "Slett",
 "Upload too large" => "Filen er for stor",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å laste opp er for store for å laste opp til denne serveren.",
 "Files are being scanned, please wait." => "Skanner filer, vennligst vent.",
-"Current scanning" => "Pågående skanning",
-"Upgrading filesystem cache..." => "Oppgraderer filsystemets  mellomlager..."
+"Current scanning" => "Pågående skanning"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index a391e25b95..c617f0bfdd 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam",
 "Could not move %s" => "Kon %s niet verplaatsen",
 "File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.",
-"File name must not contain \"/\". Please choose a different name." => "De bestandsnaam mag geen \"/\" bevatten. Kies een andere naam.",
+"\"%s\" is an invalid file name." => "\"%s\" is een ongeldige bestandsnaam.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
+"The target folder has been moved or deleted." => "De doelmap is verplaatst of verwijderd.",
 "The name %s is already used in the folder %s. Please choose a different name." => "De naam %s bestaat al in map %s. Kies een andere naam.",
 "Not a valid source" => "Geen geldige bron",
 "Server is not allowed to open URLs, please check the server configuration" => "Server mag geen URS's openen, controleer de server configuratie",
 "Error while downloading %s to %s" => "Fout bij downloaden %s naar %s",
 "Error when creating the file" => "Fout bij creëren bestand",
 "Folder name cannot be empty." => "Mapnaam mag niet leeg zijn.",
-"Folder name must not contain \"/\". Please choose a different name." => "De mapnaam mag geen \"/\" bevatten. Kies een andere naam.",
 "Error when creating the folder" => "Fout bij aanmaken map",
 "Unable to set upload directory." => "Kan upload map niet instellen.",
 "Invalid Token" => "Ongeldig Token",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
-"Upload failed. Could not get file info." => "Upload mislukt, Kon geen bestandsinfo krijgen.",
 "Upload failed. Could not find uploaded file" => "Upload mislukt. Kon ge-uploade bestand niet vinden",
+"Upload failed. Could not get file info." => "Upload mislukt, Kon geen bestandsinfo krijgen.",
 "Invalid directory." => "Ongeldige directory.",
 "Files" => "Bestanden",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is",
-"Not enough space available" => "Niet genoeg ruimte beschikbaar",
+"Total file size {size1} exceeds upload limit {size2}" => "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar",
 "Upload cancelled." => "Uploaden geannuleerd.",
 "Could not get result from server." => "Kon het resultaat van de server niet terugkrijgen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("","%n bestanden"),
 "{dirs} and {files}" => "{dirs} en {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"),
-"'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
+"\"{name}\" is an invalid file name." => "\"{name}\" is een ongeldige bestandsnaam.",
 "Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in.",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Upload is te groot",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server.",
 "Files are being scanned, please wait." => "Bestanden worden gescand, even wachten.",
-"Current scanning" => "Er wordt gescand",
-"Upgrading filesystem cache..." => "Upgraden bestandssysteem cache..."
+"Current scanning" => "Er wordt gescand"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index a5e6e737ea..4f74167d9a 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
 "Could not move %s" => "Klarte ikkje flytta %s",
 "File name cannot be empty." => "Filnamnet kan ikkje vera tomt.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.",
 "Unable to set upload directory." => "Klarte ikkje å endra opplastingsmappa.",
 "Invalid Token" => "Ugyldig token",
 "No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
@@ -14,12 +15,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Manglar ei mellombels mappe",
 "Failed to write to disk" => "Klarte ikkje skriva til disk",
 "Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
-"Upload failed. Could not get file info." => "Feil ved opplasting. Klarte ikkje å henta filinfo.",
 "Upload failed. Could not find uploaded file" => "Feil ved opplasting. Klarte ikkje å finna opplasta fil.",
+"Upload failed. Could not get file info." => "Feil ved opplasting. Klarte ikkje å henta filinfo.",
 "Invalid directory." => "Ugyldig mappe.",
 "Files" => "Filer",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.",
-"Not enough space available" => "Ikkje nok lagringsplass tilgjengeleg",
 "Upload cancelled." => "Opplasting avbroten.",
 "Could not get result from server." => "Klarte ikkje å henta resultat frå tenaren.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
@@ -34,8 +34,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n fil","%n filer"),
 "{dirs} and {files}" => "{dirs} og {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Lastar opp %n fil","Lastar opp %n filer"),
-"'.' is an invalid file name." => "«.» er eit ugyldig filnamn.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.",
 "Your storage is full, files can not be updated or synced anymore!" => "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Lagringa di er nesten full ({usedSpacePercent} %)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.",
@@ -67,7 +65,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "For stor opplasting",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren.",
 "Files are being scanned, please wait." => "Skannar filer, ver venleg og vent.",
-"Current scanning" => "Køyrande skanning",
-"Upgrading filesystem cache..." => "Oppgraderer mellomlageret av filsystemet …"
+"Current scanning" => "Køyrande skanning"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 031bd50870..3e93dc881e 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nie można było przenieść %s - Plik o takiej nazwie już istnieje",
 "Could not move %s" => "Nie można było przenieść %s",
 "File name cannot be empty." => "Nazwa pliku nie może być pusta.",
-"File name must not contain \"/\". Please choose a different name." => "Nazwa pliku nie może zawierać \"/\". Proszę wybrać inną nazwę.",
+"\"%s\" is an invalid file name." => "\"%s\" jest nieprawidłową nazwą pliku.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.",
+"The target folder has been moved or deleted." => "Folder docelowy został przeniesiony lub usunięty",
 "The name %s is already used in the folder %s. Please choose a different name." => "Nazwa %s jest już używana w folderze %s. Proszę wybrać inną nazwę.",
 "Not a valid source" => "Niepoprawne źródło",
 "Server is not allowed to open URLs, please check the server configuration" => "Serwer nie mógł otworzyć adresów URL, należy sprawdzić konfigurację serwera",
 "Error while downloading %s to %s" => "Błąd podczas pobierania %s do %S",
 "Error when creating the file" => "Błąd przy tworzeniu pliku",
 "Folder name cannot be empty." => "Nazwa folderu nie może być pusta.",
-"Folder name must not contain \"/\". Please choose a different name." => "Nazwa folderu nie może zawierać \"/\". Proszę wybrać inną nazwę.",
 "Error when creating the folder" => "Błąd przy tworzeniu folderu",
 "Unable to set upload directory." => "Nie można ustawić katalog wczytywania.",
 "Invalid Token" => "Nieprawidłowy Token",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Brak folderu tymczasowego",
 "Failed to write to disk" => "Błąd zapisu na dysk",
 "Not enough storage available" => "Za mało dostępnego miejsca",
-"Upload failed. Could not get file info." => "Nieudane przesłanie. Nie można pobrać informacji o pliku.",
 "Upload failed. Could not find uploaded file" => "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku",
+"Upload failed. Could not get file info." => "Nieudane przesłanie. Nie można pobrać informacji o pliku.",
 "Invalid directory." => "Zła ścieżka.",
 "Files" => "Pliki",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów",
-"Not enough space available" => "Za mało miejsca",
+"Total file size {size1} exceeds upload limit {size2}" => "Całkowity rozmiar {size1} przekracza limit uploadu {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}",
 "Upload cancelled." => "Wczytywanie anulowane.",
 "Could not get result from server." => "Nie można uzyskać wyniku z serwera.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
@@ -48,10 +50,9 @@ $TRANSLATIONS = array(
 "Error deleting file." => "Błąd podczas usuwania pliku",
 "_%n folder_::_%n folders_" => array("%n katalog","%n katalogi","%n katalogów"),
 "_%n file_::_%n files_" => array("%n plik","%n pliki","%n plików"),
-"{dirs} and {files}" => "{dirs} and {files}",
+"{dirs} and {files}" => "{dirs} i {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"),
-"'.' is an invalid file name." => "„.” jest nieprawidłową nazwą pliku.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.",
+"\"{name}\" is an invalid file name." => "\"{name}\" jest nieprawidłową nazwą pliku.",
 "Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie.",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Ładowany plik jest za duży",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość.",
 "Files are being scanned, please wait." => "Skanowanie plików, proszę czekać.",
-"Current scanning" => "Aktualnie skanowane",
-"Upgrading filesystem cache..." => "Uaktualnianie plików pamięci podręcznej..."
+"Current scanning" => "Aktualnie skanowane"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index f84dcfcd48..d0c27431da 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Impossível mover %s - Um arquivo com este nome já existe",
 "Could not move %s" => "Impossível mover %s",
 "File name cannot be empty." => "O nome do arquivo não pode estar vazio.",
-"File name must not contain \"/\". Please choose a different name." => "O nome do arquivo não deve conter \"/\". Por favor, escolha um nome diferente.",
+"\"%s\" is an invalid file name." => "\"%s\" é um nome de arquivo inválido.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
+"The target folder has been moved or deleted." => "A pasta de destino foi movida ou excluída.",
 "The name %s is already used in the folder %s. Please choose a different name." => "O nome %s já é usado na pasta %s. Por favor, escolha um nome diferente.",
 "Not a valid source" => "Não é uma fonte válida",
 "Server is not allowed to open URLs, please check the server configuration" => "Não é permitido ao servidor abrir URLs, por favor verificar a configuração do servidor.",
 "Error while downloading %s to %s" => "Erro ao baixar %s para %s",
 "Error when creating the file" => "Erro ao criar o arquivo",
 "Folder name cannot be empty." => "O nome da pasta não pode estar vazio.",
-"Folder name must not contain \"/\". Please choose a different name." => "O nome da pasta não pode conter \"/\". Por favor, escolha um nome diferente.",
 "Error when creating the folder" => "Erro ao criar a pasta",
 "Unable to set upload directory." => "Impossível configurar o diretório de upload",
 "Invalid Token" => "Token inválido",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Pasta temporária não encontrada",
 "Failed to write to disk" => "Falha ao escrever no disco",
 "Not enough storage available" => "Espaço de armazenamento insuficiente",
-"Upload failed. Could not get file info." => "Falha no envio. Não foi possível obter informações do arquivo.",
 "Upload failed. Could not find uploaded file" => "Falha no envio. Não foi possível encontrar o arquivo enviado",
+"Upload failed. Could not get file info." => "Falha no envio. Não foi possível obter informações do arquivo.",
 "Invalid directory." => "Diretório inválido.",
 "Files" => "Arquivos",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes",
-"Not enough space available" => "Espaço de armazenamento insuficiente",
+"Total file size {size1} exceeds upload limit {size2}" => "Tamanho total do arquivo {size1} excede limite de envio {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}",
 "Upload cancelled." => "Envio cancelado.",
 "Could not get result from server." => "Não foi possível obter o resultado do servidor.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n arquivo","%n arquivos"),
 "{dirs} and {files}" => "{dirs} e {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Enviando %n arquivo","Enviando %n arquivos"),
-"'.' is an invalid file name." => "'.' é um nome de arquivo inválido.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
+"\"{name}\" is an invalid file name." => "\"{name}\" é um nome de arquivo inválido.",
 "Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "App de encriptação está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Upload muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor.",
 "Files are being scanned, please wait." => "Arquivos sendo escaneados, por favor aguarde.",
-"Current scanning" => "Scanning atual",
-"Upgrading filesystem cache..." => "Atualizando cache do sistema de arquivos..."
+"Current scanning" => "Scanning atual"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index 4b9fade2e2..3b3c2f842b 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -1,8 +1,16 @@
 <?php
 $TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse nome",
+"Could not move %s - File with this name already exists" => "Não pôde mover o ficheiro %s - Já existe um ficheiro com esse nome",
 "Could not move %s" => "Não foi possível move o ficheiro %s",
 "File name cannot be empty." => "O nome do ficheiro não pode estar vazio.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
+"The name %s is already used in the folder %s. Please choose a different name." => "O nome %s já está em uso na pasta %s. Por favor escolha um nome diferente.",
+"Not a valid source" => "Não é uma fonte válida",
+"Server is not allowed to open URLs, please check the server configuration" => "O servidor não consegue abrir URLs, por favor verifique a configuração do servidor",
+"Error while downloading %s to %s" => "Erro ao transferir %s para %s",
+"Error when creating the file" => "Erro ao criar o ficheiro",
+"Folder name cannot be empty." => "O nome da pasta não pode estar vazio.",
+"Error when creating the folder" => "Erro ao criar a pasta",
 "Unable to set upload directory." => "Não foi possível criar o diretório de upload",
 "Invalid Token" => "Token inválido",
 "No file was uploaded. Unknown error" => "Nenhum ficheiro foi carregado. Erro desconhecido",
@@ -14,28 +22,36 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Está a faltar a pasta temporária",
 "Failed to write to disk" => "Falhou a escrita no disco",
 "Not enough storage available" => "Não há espaço suficiente em disco",
+"Upload failed. Could not find uploaded file" => "Falhou o envio. Não conseguiu encontrar o ficheiro enviado",
 "Upload failed. Could not get file info." => "O carregamento falhou. Não foi possível obter a informação do ficheiro.",
 "Invalid directory." => "Directório Inválido",
 "Files" => "Ficheiros",
-"Not enough space available" => "Espaço em disco insuficiente!",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes",
 "Upload cancelled." => "Envio cancelado.",
 "Could not get result from server." => "Não foi possível obter o resultado do servidor.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora.",
+"URL cannot be empty" => "URL não pode estar vazio",
+"In the home folder 'Shared' is a reserved filename" => "Na pasta pessoal \"Partilhado\" é um nome de ficheiro reservado",
 "{new_name} already exists" => "O nome {new_name} já existe",
+"Could not create file" => "Não pôde criar ficheiro",
+"Could not create folder" => "Não pôde criar pasta",
+"Error fetching URL" => "Erro ao obter URL",
 "Share" => "Partilhar",
 "Delete permanently" => "Eliminar permanentemente",
 "Rename" => "Renomear",
 "Pending" => "Pendente",
+"Could not rename file" => "Não pôde renomear o ficheiro",
 "replaced {new_name} with {old_name}" => "substituido {new_name} por {old_name}",
 "undo" => "desfazer",
+"Error deleting file." => "Erro ao apagar o ficheiro.",
 "_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
 "_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
 "{dirs} and {files}" => "{dirs} e {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("A carregar %n ficheiro","A carregar %n ficheiros"),
-"'.' is an invalid file name." => "'.' não é um nome de ficheiro válido!",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
 "Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados.",
 "Your storage is almost full ({usedSpacePercent}%)" => "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
 "Your download is being prepared. This might take some time if the files are big." => "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
 "Error moving file" => "Erro ao mover o ficheiro",
@@ -43,6 +59,7 @@ $TRANSLATIONS = array(
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
+"Invalid folder name. Usage of 'Shared' is reserved." => "Nome de pasta inválido. Utilização de \"Partilhado\" está reservada.",
 "%s could not be renamed" => "%s não pode ser renomeada",
 "Upload" => "Carregar",
 "File handling" => "Manuseamento de ficheiros",
@@ -54,19 +71,20 @@ $TRANSLATIONS = array(
 "Maximum input size for ZIP files" => "Tamanho máximo para ficheiros ZIP",
 "Save" => "Guardar",
 "New" => "Novo",
+"New text file" => "Novo ficheiro de texto",
 "Text file" => "Ficheiro de texto",
 "New folder" => "Nova Pasta",
 "Folder" => "Pasta",
 "From link" => "Da ligação",
 "Deleted files" => "Ficheiros eliminados",
 "Cancel upload" => "Cancelar envio",
+"You don’t have permission to upload or create files here" => "Você não tem permissão para enviar ou criar ficheiros aqui",
 "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
 "Download" => "Transferir",
 "Delete" => "Eliminar",
 "Upload too large" => "Upload muito grande",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
-"Current scanning" => "Análise actual",
-"Upgrading filesystem cache..." => "Atualizar cache do sistema de ficheiros..."
+"Current scanning" => "Análise actual"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index 933625d8d1..7686025e35 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -1,73 +1,77 @@
 <?php
 $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s nu se poate muta - Fișierul cu acest nume există deja ",
-"Could not move %s" => "Nu s-a putut muta %s",
+"Could not move %s" => "Nu se poate muta %s",
 "File name cannot be empty." => "Numele fișierului nu poate rămâne gol.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume nevalide, '\\', '/', '<', '>', ':', '\"', '|', '?' și '*' nu sunt permise.",
+"Error when creating the file" => "Eroare la crearea fisierului",
+"Error when creating the folder" => "Eroare la crearea folderului",
 "Unable to set upload directory." => "Imposibil de a seta directorul pentru incărcare.",
 "Invalid Token" => "Jeton Invalid",
-"No file was uploaded. Unknown error" => "Nici un fișier nu a fost încărcat. Eroare necunoscută",
+"No file was uploaded. Unknown error" => "Niciun fișier nu a fost încărcat. Eroare necunoscută",
 "There is no error, the file uploaded with success" => "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fisierul incarcat depaseste marimea maxima permisa in php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fișierul încărcat depășește directiva upload_max_filesize din php.ini:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul încărcat depășește directiva MAX_FILE_SIZE specificată în formularul HTML",
 "The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
-"No file was uploaded" => "Nu a fost încărcat nici un fișier",
+"No file was uploaded" => "Nu a fost încărcat niciun fișier",
 "Missing a temporary folder" => "Lipsește un dosar temporar",
-"Failed to write to disk" => "Eroare la scrierea discului",
-"Not enough storage available" => "Nu este suficient spațiu disponibil",
-"Upload failed. Could not get file info." => "Încărcare eșuată. Nu se pot obține informații despre fișier.",
+"Failed to write to disk" => "Eroare la scrierea pe disc",
+"Not enough storage available" => "Nu este disponibil suficient spațiu",
 "Upload failed. Could not find uploaded file" => "Încărcare eșuată. Nu se poate găsi fișierul încărcat",
-"Invalid directory." => "registru invalid.",
+"Upload failed. Could not get file info." => "Încărcare eșuată. Nu se pot obține informații despre fișier.",
+"Invalid directory." => "Dosar nevalid.",
 "Files" => "Fișiere",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți",
-"Not enough space available" => "Nu este suficient spațiu disponibil",
 "Upload cancelled." => "Încărcare anulată.",
 "Could not get result from server." => "Nu se poate obține rezultatul de la server.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
-"{new_name} already exists" => "{new_name} deja exista",
-"Share" => "a imparti",
-"Delete permanently" => "Stergere permanenta",
-"Rename" => "Redenumire",
-"Pending" => "in timpul",
-"replaced {new_name} with {old_name}" => "{new_name} inlocuit cu {old_name}",
-"undo" => "Anulează ultima acțiune",
+"URL cannot be empty" => "URL nu poate fi gol",
+"{new_name} already exists" => "{new_name} există deja",
+"Could not create file" => "Nu s-a putut crea fisierul",
+"Could not create folder" => "Nu s-a putut crea folderul",
+"Share" => "Partajează",
+"Delete permanently" => "Șterge permanent",
+"Rename" => "Redenumește",
+"Pending" => "În așteptare",
+"Could not rename file" => "Nu s-a putut redenumi fisierul",
+"replaced {new_name} with {old_name}" => "{new_name} a fost înlocuit cu {old_name}",
+"undo" => "desfă",
 "_%n folder_::_%n folders_" => array("%n director","%n directoare","%n directoare"),
 "_%n file_::_%n files_" => array("%n fișier","%n fișiere","%n fișiere"),
 "{dirs} and {files}" => "{dirs} și {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."),
-"'.' is an invalid file name." => "'.' este un nume invalid de fișier.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise.",
-"Your storage is full, files can not be updated or synced anymore!" => "Spatiul de stocare este plin, fisierele nu mai pot fi actualizate sau sincronizate",
-"Your storage is almost full ({usedSpacePercent}%)" => "Spatiul de stocare este aproape plin {spatiu folosit}%",
+"Your storage is full, files can not be updated or synced anymore!" => "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Spațiul de stocare este aproape plin ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele",
-"Your download is being prepared. This might take some time if the files are big." => "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari.",
+"Your download is being prepared. This might take some time if the files are big." => "Se pregătește descărcarea. Aceasta poate dura ceva timp dacă fișierele sunt mari.",
 "Error moving file" => "Eroare la mutarea fișierului",
 "Error" => "Eroare",
 "Name" => "Nume",
-"Size" => "Dimensiune",
+"Size" => "Mărime",
 "Modified" => "Modificat",
 "%s could not be renamed" => "%s nu a putut fi redenumit",
-"Upload" => "Încărcare",
+"Upload" => "Încărcă",
 "File handling" => "Manipulare fișiere",
 "Maximum upload size" => "Dimensiune maximă admisă la încărcare",
 "max. possible: " => "max. posibil:",
-"Needed for multi-file and folder downloads." => "necesar la descarcarea mai multor liste si fisiere",
-"Enable ZIP-download" => "permite descarcarea codurilor ZIP",
-"0 is unlimited" => "0 e nelimitat",
-"Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate",
+"Needed for multi-file and folder downloads." => "Necesar pentru descărcarea mai multor fișiere și a dosarelor.",
+"Enable ZIP-download" => "Permite descărcarea ZIP",
+"0 is unlimited" => "0 este nelimitat",
+"Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișierele ZIP",
 "Save" => "Salvează",
 "New" => "Nou",
-"Text file" => "lista",
+"Text file" => "Fișier text",
 "Folder" => "Dosar",
-"From link" => "de la adresa",
-"Deleted files" => "Sterge fisierele",
+"From link" => "De la adresa",
+"Deleted files" => "Fișiere șterse",
 "Cancel upload" => "Anulează încărcarea",
+"You don’t have permission to upload or create files here" => "Nu aveti permisiunea de a incarca sau crea fisiere aici",
 "Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
 "Download" => "Descarcă",
 "Delete" => "Șterge",
 "Upload too large" => "Fișierul încărcat este prea mare",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server.",
-"Files are being scanned, please wait." => "Fișierele sunt scanate, asteptati va rog",
-"Current scanning" => "În curs de scanare",
-"Upgrading filesystem cache..." => "Modernizare fisiere de sistem cache.."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server.",
+"Files are being scanned, please wait." => "Fișierele sunt scanate, te rog așteaptă.",
+"Current scanning" => "În curs de scanare"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 968da63aac..ac958e5dfd 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -3,66 +3,67 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Невозможно переместить %s - файл с таким именем уже существует",
 "Could not move %s" => "Невозможно переместить %s",
 "File name cannot be empty." => "Имя файла не может быть пустым.",
-"File name must not contain \"/\". Please choose a different name." => "Имя файла не должно содержать символ \"/\". Пожалуйста, выберите другое имя.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Имя %s уже используется в папке %s. Пожалуйста выберите другое имя.",
+"\"%s\" is an invalid file name." => "\"%s\" это не правильное имя файла.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя: символы '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.",
+"The target folder has been moved or deleted." => "Целевой каталог был перемещен или удален.",
+"The name %s is already used in the folder %s. Please choose a different name." => "Имя %s уже используется для каталога %s. Пожалуйста, выберите другое имя.",
 "Not a valid source" => "Неправильный источник",
 "Server is not allowed to open URLs, please check the server configuration" => "Сервер не позволяет открывать URL-адреса, пожалуйста, проверьте настройки сервера",
-"Error while downloading %s to %s" => "Ошибка при загрузке %s в %s",
+"Error while downloading %s to %s" => "Ошибка при скачивании %s в %s",
 "Error when creating the file" => "Ошибка при создании файла",
 "Folder name cannot be empty." => "Имя папки не может быть пустым.",
-"Folder name must not contain \"/\". Please choose a different name." => "Имя папки не должно содержать символ \"/\". Пожалуйста, выберите другое имя.",
-"Error when creating the folder" => "Ошибка при создании папки",
+"Error when creating the folder" => "Ошибка создания каталога",
 "Unable to set upload directory." => "Не удалось установить каталог загрузки.",
 "Invalid Token" => "Недопустимый маркер",
 "No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
 "There is no error, the file uploaded with success" => "Файл загружен успешно.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Файл превышает размер установленный upload_max_filesize в php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML",
-"The uploaded file was only partially uploaded" => "Файл загружен частично",
-"No file was uploaded" => "Файл не был загружен",
-"Missing a temporary folder" => "Отсутствует временная папка",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Загруженный файл превышает размер, установленный параметром MAX_FILE_SIZE в HTML-форме",
+"The uploaded file was only partially uploaded" => "Файл загружен лишь частично",
+"No file was uploaded" => "Ни одного файла загружено не было",
+"Missing a temporary folder" => "Отсутствует временный каталог",
 "Failed to write to disk" => "Ошибка записи на диск",
 "Not enough storage available" => "Недостаточно доступного места в хранилище",
+"Upload failed. Could not find uploaded file" => "Загрузка не удалась. Невозможно найти загружаемый файл",
 "Upload failed. Could not get file info." => "Загрузка не удалась. Невозможно получить информацию о файле",
-"Upload failed. Could not find uploaded file" => "Загрузка не удалась. Невозможно найти загруженный файл",
-"Invalid directory." => "Неправильный каталог.",
+"Invalid directory." => "Неверный каталог.",
 "Files" => "Файлы",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Невозможно загрузить файл  {filename} так как он является директорией либо имеет размер 0 байт",
-"Not enough space available" => "Недостаточно свободного места",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера",
+"Total file size {size1} exceeds upload limit {size2}" => "Полный размер файла {size1} превышает лимит по загрузке {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Не достаточно свободного места, Вы загружаете {size1} но осталось только {size2}",
 "Upload cancelled." => "Загрузка отменена.",
-"Could not get result from server." => "Не получен ответ от сервера",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.",
+"Could not get result from server." => "Не удалось получить ответ от сервера.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
 "URL cannot be empty" => "Ссылка не может быть пустой.",
-"In the home folder 'Shared' is a reserved filename" => "В домашней папке 'Shared' зарезервированное имя файла",
+"In the home folder 'Shared' is a reserved filename" => "'Shared' - это зарезервированное имя файла в домашнем каталоге",
 "{new_name} already exists" => "{new_name} уже существует",
 "Could not create file" => "Не удалось создать файл",
-"Could not create folder" => "Не удалось создать папку",
+"Could not create folder" => "Не удалось создать каталог",
 "Error fetching URL" => "Ошибка получения URL",
 "Share" => "Открыть доступ",
-"Delete permanently" => "Удалено навсегда",
+"Delete permanently" => "Удалить окончательно",
 "Rename" => "Переименовать",
 "Pending" => "Ожидание",
 "Could not rename file" => "Не удалось переименовать файл",
 "replaced {new_name} with {old_name}" => "заменено {new_name} на {old_name}",
 "undo" => "отмена",
 "Error deleting file." => "Ошибка при удалении файла.",
-"_%n folder_::_%n folders_" => array("%n папка","%n папки","%n папок"),
+"_%n folder_::_%n folders_" => array("%n каталог","%n каталога","%n каталогов"),
 "_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
 "{dirs} and {files}" => "{dirs} и {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"),
-"'.' is an invalid file name." => "'.' - неправильное имя файла.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ваше дисковое пространство полностью заполнено, произведите очистку перед загрузкой новых файлов.",
+"\"{name}\" is an invalid file name." => "\"{name}\" это не правильное имя файла.",
+"Your storage is full, files can not be updated or synced anymore!" => "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Приложение для шифрования активно, но ваши ключи не инициализированы, пожалуйста, перелогиньтесь",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Неверный приватный ключ для приложения шифрования. Пожалуйста, обноваите ваш приватный ключ в персональных настройках чтобы восстановить доступ к вашим зашифрованным файлам.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрование было отключено, но ваши файлы все еще зашифрованы. Пожалуйста, зайдите на страницу персональных настроек для того, чтобы расшифровать ваши файлы.",
-"Your download is being prepared. This might take some time if the files are big." => "Загрузка началась. Это может потребовать много времени, если файл большого размера.",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.",
+"Your download is being prepared. This might take some time if the files are big." => "Идёт подготовка к скачиванию. Это может занять некоторое время, если файлы большого размера.",
 "Error moving file" => "Ошибка при перемещении файла",
 "Error" => "Ошибка",
 "Name" => "Имя",
 "Size" => "Размер",
-"Modified" => "Изменён",
+"Modified" => "Дата изменения",
 "Invalid folder name. Usage of 'Shared' is reserved." => "Неправильное имя каталога. Имя 'Shared' зарезервировано.",
 "%s could not be renamed" => "%s не может быть переименован",
 "Upload" => "Загрузка",
@@ -70,26 +71,25 @@ $TRANSLATIONS = array(
 "Maximum upload size" => "Максимальный размер загружаемого файла",
 "max. possible: " => "макс. возможно: ",
 "Needed for multi-file and folder downloads." => "Требуется для скачивания нескольких файлов и папок",
-"Enable ZIP-download" => "Включить ZIP-скачивание",
+"Enable ZIP-download" => "Включить скачивание в виде архивов ZIP",
 "0 is unlimited" => "0 - без ограничений",
 "Maximum input size for ZIP files" => "Максимальный исходный размер для ZIP файлов",
 "Save" => "Сохранить",
 "New" => "Новый",
 "New text file" => "Новый текстовый файл",
 "Text file" => "Текстовый файл",
-"New folder" => "Новая папка",
-"Folder" => "Папка",
-"From link" => "Из ссылки",
+"New folder" => "Новый каталог",
+"Folder" => "Каталог",
+"From link" => "Объект по ссылке",
 "Deleted files" => "Удалённые файлы",
-"Cancel upload" => "Отмена загрузки",
-"You don’t have permission to upload or create files here" => "У вас недостаточно прав для загрузки или создания файлов отсюда.",
+"Cancel upload" => "Отменить загрузку",
+"You don’t have permission to upload or create files here" => "У вас нет прав для загрузки или создания файлов здесь.",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
 "Download" => "Скачать",
 "Delete" => "Удалить",
 "Upload too large" => "Файл слишком велик",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере.",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.",
 "Files are being scanned, please wait." => "Подождите, файлы сканируются.",
-"Current scanning" => "Текущее сканирование",
-"Upgrading filesystem cache..." => "Обновление кэша файловой системы..."
+"Current scanning" => "Текущее сканирование"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 2d0eb25f62..e80ca0186c 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -3,13 +3,13 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Nie je možné presunúť %s - súbor s týmto menom už existuje",
 "Could not move %s" => "Nie je možné presunúť %s",
 "File name cannot be empty." => "Meno súboru nemôže byť prázdne",
-"File name must not contain \"/\". Please choose a different name." => "Názov súboru nesmie obsahovať \"/\". Prosím zvoľte iný názov.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Názov %s už používa priečinok s%. Prosím zvoľte iný názov.",
 "Not a valid source" => "Neplatný zdroj",
+"Server is not allowed to open URLs, please check the server configuration" => "Server nie je oprávnený otvárať adresy URL. Overte nastavenia servera.",
 "Error while downloading %s to %s" => "Chyba pri sťahovaní súboru %s do %s",
 "Error when creating the file" => "Chyba pri vytváraní súboru",
 "Folder name cannot be empty." => "Názov priečinka nemôže byť prázdny.",
-"Folder name must not contain \"/\". Please choose a different name." => "Názov priečinka nesmie obsahovať \"/\". Prosím zvoľte iný názov.",
 "Error when creating the folder" => "Chyba pri vytváraní priečinka",
 "Unable to set upload directory." => "Nemožno nastaviť priečinok pre nahrané súbory.",
 "Invalid Token" => "Neplatný token",
@@ -22,12 +22,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Chýba dočasný priečinok",
 "Failed to write to disk" => "Zápis na disk sa nepodaril",
 "Not enough storage available" => "Nedostatok dostupného úložného priestoru",
-"Upload failed. Could not get file info." => "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore.",
 "Upload failed. Could not find uploaded file" => "Nahrávanie zlyhalo. Nepodarilo sa nájsť nahrávaný súbor",
+"Upload failed. Could not get file info." => "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore.",
 "Invalid directory." => "Neplatný priečinok.",
 "Files" => "Súbory",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov",
-"Not enough space available" => "Nie je k dispozícii dostatok miesta",
 "Upload cancelled." => "Odosielanie zrušené.",
 "Could not get result from server." => "Nepodarilo sa dostať výsledky zo servera.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
@@ -36,6 +35,7 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} už existuje",
 "Could not create file" => "Nemožno vytvoriť súbor",
 "Could not create folder" => "Nemožno vytvoriť priečinok",
+"Error fetching URL" => "Chyba pri načítavaní URL",
 "Share" => "Zdieľať",
 "Delete permanently" => "Zmazať  trvalo",
 "Rename" => "Premenovať",
@@ -48,8 +48,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
 "{dirs} and {files}" => "{dirs} a {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"),
-"'.' is an invalid file name." => "'.' je neplatné meno súboru.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
 "Your storage is full, files can not be updated or synced anymore!" => "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste.",
@@ -87,7 +85,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Nahrávanie je príliš veľké",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
 "Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané.",
-"Current scanning" => "Práve prezerané",
-"Upgrading filesystem cache..." => "Aktualizujem medzipamäť súborového systému..."
+"Current scanning" => "Práve prezerané"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 037e5f6b6b..ae54ace12d 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Datoteke %s ni mogoče premakniti  - datoteka s tem imenom že obstaja.",
 "Could not move %s" => "Datoteke %s ni mogoče premakniti",
 "File name cannot be empty." => "Ime datoteke ne sme biti prazno polje.",
-"File name must not contain \"/\". Please choose a different name." => "Ime datoteke ne sme vsebovati znaka \"/\". Določiti je treba drugo ime.",
+"\"%s\" is an invalid file name." => "\"%s\" je neveljavno ime datoteke.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
+"The target folder has been moved or deleted." => "Ciljna mapa je premaknjena ali izbrisana.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Ime %s je že v mapi %s že v uporabi. Izbrati je treba drugo ime.",
 "Not a valid source" => "Vir ni veljaven",
 "Server is not allowed to open URLs, please check the server configuration" => "Odpiranje naslovov URL preko strežnika ni dovoljeno. Preverite nastavitve strežnika.",
 "Error while downloading %s to %s" => "Napaka med prejemanjem %s v mapo %s",
 "Error when creating the file" => "Napaka med ustvarjanjem datoteke",
 "Folder name cannot be empty." => "Ime mape ne more biti prazna vrednost.",
-"Folder name must not contain \"/\". Please choose a different name." => "Ime mape ne sme vsebovati znaka \"/\". Določiti je treba drugo ime.",
 "Error when creating the folder" => "Napaka med ustvarjanjem mape",
 "Unable to set upload directory." => "Mapo, v katero boste prenašali dokumente, ni mogoče določiti",
 "Invalid Token" => "Neveljaven žeton",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Failed to write to disk" => "Pisanje na disk je spodletelo",
 "Not enough storage available" => "Na voljo ni dovolj prostora",
-"Upload failed. Could not get file info." => "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke.",
 "Upload failed. Could not find uploaded file" => "Pošiljanje je spodletelo. Ni mogoče najti poslane datoteke.",
+"Upload failed. Could not get file info." => "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke.",
 "Invalid directory." => "Neveljavna mapa.",
 "Files" => "Datoteke",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.",
-"Not enough space available" => "Na voljo ni dovolj prostora.",
+"Total file size {size1} exceeds upload limit {size2}" => "Skupna velikost {size1} presega omejitev velikosti {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.",
 "Upload cancelled." => "Pošiljanje je preklicano.",
 "Could not get result from server." => "Ni mogoče pridobiti podatkov s strežnika.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n datoteka","%n datoteki","%n datoteke","%n datotek"),
 "{dirs} and {files}" => "{dirs} in {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Posodabljanje %n datoteke","Posodabljanje %n datotek","Posodabljanje %n datotek","Posodabljanje %n datotek"),
-"'.' is an invalid file name." => "'.' je neveljavno ime datoteke.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
+"\"{name}\" is an invalid file name." => "\"{name}\" je neveljavno ime datoteke.",
 "Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite.",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Prekoračenje omejitve velikosti",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku.",
 "Files are being scanned, please wait." => "Poteka preučevanje datotek, počakajte ...",
-"Current scanning" => "Trenutno poteka preučevanje",
-"Upgrading filesystem cache..." => "Nadgrajevanje predpomnilnika datotečnega sistema ..."
+"Current scanning" => "Trenutno poteka preučevanje"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
index a06b6821af..073f2def62 100644
--- a/apps/files/l10n/sq.php
+++ b/apps/files/l10n/sq.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer",
 "Could not move %s" => "Nuk mund të zhvendoset %s",
 "File name cannot be empty." => "Emri i skedarit nuk mund të jetë bosh.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.",
 "Unable to set upload directory." => "E pa mundur të vendoset dosja e ngarkimit",
 "Invalid Token" => "Shenjë e gabuar",
 "No file was uploaded. Unknown error" => "Asnjë skedar nuk u dërgua. Gabim i pa njohur",
@@ -16,10 +17,11 @@ $TRANSLATIONS = array(
 "Not enough storage available" => "Hapsira e arkivimit e pamjaftueshme",
 "Invalid directory." => "Dosje e pavlefshme",
 "Files" => "Skedarë",
-"Not enough space available" => "Nuk ka hapsirë të nevojshme",
 "Upload cancelled." => "Ngarkimi u anullua",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
+"URL cannot be empty" => "URL-i nuk mund të jetë bosh",
 "{new_name} already exists" => "{new_name} është ekzistues ",
+"Could not create folder" => "I pamundur krijimi i kartelës",
 "Share" => "Ndaj",
 "Delete permanently" => "Fshi përfundimisht",
 "Rename" => "Riemëro",
@@ -30,12 +32,11 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n skedar","%n skedarë"),
 "{dirs} and {files}" => "{dirs} dhe {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Po ngarkoj %n skedar","Po ngarkoj %n skedarë"),
-"'.' is an invalid file name." => "'.' nuk është skedar i vlefshem.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.",
 "Your storage is full, files can not be updated or synced anymore!" => "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Hapsira juaj e arkivimit është pothuajse në fund  ({usedSpacePercent}%)",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.",
 "Your download is being prepared. This might take some time if the files are big." => "Shkarkimi juaj është duke u përgatitur. Kjo mund të kërkojë kohë nëse skedarët janë të mëdhenj.",
+"Error moving file" => "Gabim lëvizjen dokumentave",
 "Error" => "Gabim",
 "Name" => "Emri",
 "Size" => "Madhësia",
@@ -52,6 +53,7 @@ $TRANSLATIONS = array(
 "Save" => "Ruaj",
 "New" => "E re",
 "Text file" => "Skedar tekst",
+"New folder" => "Dosje e're",
 "Folder" => "Dosje",
 "From link" => "Nga lidhja",
 "Deleted files" => "Skedarë të fshirë ",
@@ -62,7 +64,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Ngarkimi shumë i madh",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri.",
 "Files are being scanned, please wait." => "Skanerizimi i skedarit në proces. Ju lutem prisni.",
-"Current scanning" => "Skanimi aktual",
-"Upgrading filesystem cache..." => "Përditësimi i cache-se së sistemit në procesim..."
+"Current scanning" => "Skanimi aktual"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index e383b66e07..2a1b478b2a 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Не могу да преместим %s – датотека с овим именом већ постоји",
 "Could not move %s" => "Не могу да преместим %s",
 "File name cannot be empty." => "Име датотеке не може бити празно.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
 "No file was uploaded. Unknown error" => "Ниједна датотека није отпремљена услед непознате грешке",
 "There is no error, the file uploaded with success" => "Није дошло до грешке. Датотека је успешно отпремљена.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:",
@@ -14,7 +15,6 @@ $TRANSLATIONS = array(
 "Not enough storage available" => "Нема довољно простора",
 "Invalid directory." => "неисправна фасцикла.",
 "Files" => "Датотеке",
-"Not enough space available" => "Нема довољно простора",
 "Upload cancelled." => "Отпремање је прекинуто.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.",
 "{new_name} already exists" => "{new_name} већ постоји",
@@ -27,8 +27,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array("","",""),
 "_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"'.' is an invalid file name." => "Датотека „.“ је неисправног имена.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ваше складиште је скоро па пуно ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Припремам преузимање. Ово може да потраје ако су датотеке велике.",
@@ -57,7 +55,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Датотека је превелика",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Датотеке које желите да отпремите прелазе ограничење у величини.",
 "Files are being scanned, please wait." => "Скенирам датотеке…",
-"Current scanning" => "Тренутно скенирање",
-"Upgrading filesystem cache..." => "Дограђујем кеш система датотека…"
+"Current scanning" => "Тренутно скенирање"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index 13ce5ec8b3..67bf30d860 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -7,6 +7,7 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Nedostaje privremena fascikla",
 "Files" => "Fajlovi",
 "Share" => "Podeli",
+"Rename" => "Preimenij",
 "_%n folder_::_%n folders_" => array("","",""),
 "_%n file_::_%n files_" => array("","",""),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
diff --git a/apps/files/l10n/su.php b/apps/files/l10n/su.php
new file mode 100644
index 0000000000..70ab6572ba
--- /dev/null
+++ b/apps/files/l10n/su.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%n folder_::_%n folders_" => array(""),
+"_%n file_::_%n files_" => array(""),
+"_Uploading %n file_::_Uploading %n files_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 9e1b8110d4..fa88a1e966 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -3,13 +3,12 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Kunde inte flytta %s - Det finns redan en fil med detta namn",
 "Could not move %s" => "Kan inte flytta %s",
 "File name cannot be empty." => "Filnamn kan inte vara tomt.",
-"File name must not contain \"/\". Please choose a different name." => "Filnamnet får ej innehålla \"/\". Välj ett annat namn.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Namnet %s används  redan i katalogen %s. Välj ett annat namn.",
 "Not a valid source" => "Inte en giltig källa",
 "Error while downloading %s to %s" => "Fel under nerladdning från %s till %s",
 "Error when creating the file" => "Fel under skapande utav filen",
 "Folder name cannot be empty." => "Katalognamn kan ej vara tomt.",
-"Folder name must not contain \"/\". Please choose a different name." => "Katalog namnet får ej innehålla \"/\". Välj ett annat namn.",
 "Error when creating the folder" => "Fel under skapande utav en katalog",
 "Unable to set upload directory." => "Kan inte sätta mapp för uppladdning.",
 "Invalid Token" => "Ogiltig token",
@@ -22,12 +21,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "En temporär mapp saknas",
 "Failed to write to disk" => "Misslyckades spara till disk",
 "Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
-"Upload failed. Could not get file info." => "Uppladdning misslyckades. Gick inte att hämta filinformation.",
 "Upload failed. Could not find uploaded file" => "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen",
+"Upload failed. Could not get file info." => "Uppladdning misslyckades. Gick inte att hämta filinformation.",
 "Invalid directory." => "Felaktig mapp.",
 "Files" => "Filer",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.",
-"Not enough space available" => "Inte tillräckligt med utrymme tillgängligt",
 "Upload cancelled." => "Uppladdning avbruten.",
 "Could not get result from server." => "Gick inte att hämta resultat från server.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
@@ -48,8 +46,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n fil","%n filer"),
 "{dirs} and {files}" => "{dirs} och {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("Laddar upp %n fil","Laddar upp %n filer"),
-"'.' is an invalid file name." => "'.' är ett ogiltigt filnamn.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen",
@@ -86,7 +82,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "För stor uppladdning",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern.",
 "Files are being scanned, please wait." => "Filer skannas, var god vänta",
-"Current scanning" => "Aktuell skanning",
-"Upgrading filesystem cache..." => "Uppgraderar filsystemets cache..."
+"Current scanning" => "Aktuell skanning"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index f91a74ee9b..c0589feece 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
 "No file was uploaded. Unknown error" => "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு",
 "There is no error, the file uploaded with success" => "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "பதிவேற்றப்பட்ட கோப்பானது HTML  படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE  directive ஐ விட கூடியது",
@@ -19,7 +20,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array("",""),
 "_%n file_::_%n files_" => array("",""),
 "_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
 "Error" => "வழு",
 "Name" => "பெயர்",
 "Size" => "அளவு",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 38a67c5067..110b84cad5 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว",
 "Could not move %s" => "ไม่สามารถย้าย %s ได้",
 "File name cannot be empty." => "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
 "No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
 "There is no error, the file uploaded with success" => "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini",
@@ -14,7 +15,6 @@ $TRANSLATIONS = array(
 "Not enough storage available" => "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
 "Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง",
 "Files" => "ไฟล์",
-"Not enough space available" => "มีพื้นที่เหลือไม่เพียงพอ",
 "Upload cancelled." => "การอัพโหลดถูกยกเลิก",
 "File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
 "{new_name} already exists" => "{new_name} มีอยู่แล้วในระบบ",
@@ -26,8 +26,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array(""),
 "_%n file_::_%n files_" => array(""),
 "_Uploading %n file_::_Uploading %n files_" => array(""),
-"'.' is an invalid file name." => "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
 "Your storage is full, files can not be updated or synced anymore!" => "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป",
 "Your storage is almost full ({usedSpacePercent}%)" => "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่",
@@ -46,6 +44,7 @@ $TRANSLATIONS = array(
 "Save" => "บันทึก",
 "New" => "อัพโหลดไฟล์ใหม่",
 "Text file" => "ไฟล์ข้อความ",
+"New folder" => "โฟลเดอร์ใหม่",
 "Folder" => "แฟ้มเอกสาร",
 "From link" => "จากลิงก์",
 "Cancel upload" => "ยกเลิกการอัพโหลด",
@@ -55,7 +54,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
 "Files are being scanned, please wait." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่.",
-"Current scanning" => "ไฟล์ที่กำลังสแกนอยู่ขณะนี้",
-"Upgrading filesystem cache..." => "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
+"Current scanning" => "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 90b16922a7..a2570e002a 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -3,14 +3,15 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "%s taşınamadı - Bu isimde dosya zaten var",
 "Could not move %s" => "%s taşınamadı",
 "File name cannot be empty." => "Dosya adı boş olamaz.",
-"File name must not contain \"/\". Please choose a different name." => "Dosya adı \"/\" içermemelidir. Lütfen farklı bir isim seçin.",
+"\"%s\" is an invalid file name." => "'%s' geçersiz bir dosya adı.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
+"The target folder has been moved or deleted." => "Hedef klasör taşındı veya silindi.",
 "The name %s is already used in the folder %s. Please choose a different name." => "%s ismi zaten %s klasöründe kullanılıyor. Lütfen farklı bir isim seçin.",
 "Not a valid source" => "Geçerli bir kaynak değil",
 "Server is not allowed to open URLs, please check the server configuration" => "Sunucunun adresleri açma izi yok, lütfen sunucu yapılandırmasını denetleyin",
 "Error while downloading %s to %s" => "%s, %s içine indirilirken hata",
 "Error when creating the file" => "Dosya oluşturulurken hata",
 "Folder name cannot be empty." => "Klasör adı boş olamaz.",
-"Folder name must not contain \"/\". Please choose a different name." => "Klasör adı \"/\" içermemelidir. Lütfen farklı bir isim seçin.",
 "Error when creating the folder" => "Klasör oluşturulurken hata",
 "Unable to set upload directory." => "Yükleme dizini tanımlanamadı.",
 "Invalid Token" => "Geçersiz Simge",
@@ -23,12 +24,13 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Geçici dizin eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Not enough storage available" => "Yeterli disk alanı yok",
-"Upload failed. Could not get file info." => "Yükleme başarısız. Dosya bilgisi alınamadı.",
 "Upload failed. Could not find uploaded file" => "Yükleme başarısız. Yüklenen dosya bulunamadı",
+"Upload failed. Could not get file info." => "Yükleme başarısız. Dosya bilgisi alınamadı.",
 "Invalid directory." => "Geçersiz dizin.",
 "Files" => "Dosyalar",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Bir dizin veya 0 bayt olduğundan {filename} yüklenemedi",
-"Not enough space available" => "Yeterli disk alanı yok",
+"Total file size {size1} exceeds upload limit {size2}" => "Toplam dosya boyutu {size1} gönderme sınırını {size2} aşıyor",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut",
 "Upload cancelled." => "Yükleme iptal edildi.",
 "Could not get result from server." => "Sunucudan sonuç alınamadı.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
@@ -50,8 +52,7 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n dosya","%n dosya"),
 "{dirs} and {files}" => "{dirs} ve {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
-"'.' is an invalid file name." => "'.' geçersiz bir dosya adı.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
+"\"{name}\" is an invalid file name." => "\"{name}\" geçersiz bir dosya adı.",
 "Your storage is full, files can not be updated or synced anymore!" => "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek.",
 "Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın",
@@ -89,7 +90,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Yükleme çok büyük",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor.",
 "Files are being scanned, please wait." => "Dosyalar taranıyor, lütfen bekleyin.",
-"Current scanning" => "Güncel tarama",
-"Upgrading filesystem cache..." => "Sistem dosyası önbelleği güncelleniyor"
+"Current scanning" => "Güncel tarama"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
index 45458c51af..ee188d927e 100644
--- a/apps/files/l10n/ug.php
+++ b/apps/files/l10n/ug.php
@@ -7,7 +7,6 @@ $TRANSLATIONS = array(
 "Failed to write to disk" => "دىسكىغا يازالمىدى",
 "Not enough storage available" => "يېتەرلىك ساقلاش بوشلۇقى يوق",
 "Files" => "ھۆججەتلەر",
-"Not enough space available" => "يېتەرلىك بوشلۇق يوق",
 "Upload cancelled." => "يۈكلەشتىن ۋاز كەچتى.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload.",
 "{new_name} already exists" => "{new_name} مەۋجۇت",
@@ -34,7 +33,6 @@ $TRANSLATIONS = array(
 "Nothing in here. Upload something!" => "بۇ جايدا ھېچنېمە يوق. Upload something!",
 "Download" => "چۈشۈر",
 "Delete" => "ئۆچۈر",
-"Upload too large" => "يۈكلەندىغىنى بەك چوڭ",
-"Upgrading filesystem cache..." => "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
+"Upload too large" => "يۈكلەندىغىنى بەك چوڭ"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 1e37d3d77d..b74126c446 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує",
 "Could not move %s" => "Не вдалося перемістити %s",
 "File name cannot be empty." => " Ім'я файлу не може бути порожнім.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
 "Folder name cannot be empty." => "Ім'я теки не може бути порожнім.",
 "Unable to set upload directory." => "Не вдалося встановити каталог завантаження.",
 "No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка",
@@ -16,7 +17,6 @@ $TRANSLATIONS = array(
 "Not enough storage available" => "Місця більше немає",
 "Invalid directory." => "Невірний каталог.",
 "Files" => "Файли",
-"Not enough space available" => "Місця більше немає",
 "Upload cancelled." => "Завантаження перервано.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.",
 "URL cannot be empty" => "URL не може бути порожнім",
@@ -33,8 +33,6 @@ $TRANSLATIONS = array(
 "_%n folder_::_%n folders_" => array("%n тека","%n тека","%n теки"),
 "_%n file_::_%n files_" => array("%n файл","%n файлів","%n файли"),
 "_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"'.' is an invalid file name." => "'.' це невірне ім'я файлу.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ваше сховище майже повне ({usedSpacePercent}%)",
 "Your download is being prepared. This might take some time if the files are big." => "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі.",
@@ -66,7 +64,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "Файл занадто великий",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
 "Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
-"Current scanning" => "Поточне сканування",
-"Upgrading filesystem cache..." => "Оновлення кеша файлової системи..."
+"Current scanning" => "Поточне сканування"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 8236d5e7ef..8812bb1b20 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -3,6 +3,16 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống",
 "Could not move %s" => "Không thể di chuyển %s",
 "File name cannot be empty." => "Tên file không được rỗng",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
+"The name %s is already used in the folder %s. Please choose a different name." => "Tên %s đã được sử dụng trong thư mục %s. Hãy chọn tên khác.",
+"Not a valid source" => "Nguồn không hợp lệ",
+"Server is not allowed to open URLs, please check the server configuration" => "Server cấm mở URLs, vui lòng kiểm tra lại cấu hình server",
+"Error while downloading %s to %s" => "Lỗi trong trong quá trình tải %s từ %s",
+"Error when creating the file" => "Lỗi khi tạo file",
+"Folder name cannot be empty." => "Tên thư mục không thể để trống",
+"Error when creating the folder" => "Lỗi khi tạo thư mục",
+"Unable to set upload directory." => "Không thể thiết lập thư mục tải lên.",
+"Invalid Token" => "Xác thực không hợp lệ",
 "No file was uploaded. Unknown error" => "Không có tập tin nào được tải lên. Lỗi không xác định",
 "There is no error, the file uploaded with success" => "Không có lỗi, các tập tin đã được tải lên thành công",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
@@ -12,30 +22,41 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "Không tìm thấy thư mục tạm",
 "Failed to write to disk" => "Không thể ghi ",
 "Not enough storage available" => "Không đủ không gian lưu trữ",
+"Upload failed. Could not find uploaded file" => "Tải lên thất bại. Không thể tìm thấy tập tin được tải lên",
+"Upload failed. Could not get file info." => "Tải lên thất bại. Không thể có được thông tin tập tin.",
 "Invalid directory." => "Thư mục không hợp lệ",
 "Files" => "Tập tin",
-"Not enough space available" => "Không đủ chỗ trống cần thiết",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte",
 "Upload cancelled." => "Hủy tải lên",
+"Could not get result from server." => "Không thể nhận được kết quả từ máy chủ.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
+"URL cannot be empty" => "URL không thể để trống",
 "{new_name} already exists" => "{new_name} đã tồn tại",
+"Could not create file" => "Không thể tạo file",
+"Could not create folder" => "Không thể tạo thư mục",
 "Share" => "Chia sẻ",
 "Delete permanently" => "Xóa vĩnh vễn",
 "Rename" => "Sửa tên",
 "Pending" => "Đang chờ",
+"Could not rename file" => "Không thể đổi tên file",
 "replaced {new_name} with {old_name}" => "đã thay thế {new_name} bằng {old_name}",
 "undo" => "lùi lại",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"'.' is an invalid file name." => "'.' là một tên file không hợp lệ",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
+"Error deleting file." => "Lỗi xóa file,",
+"_%n folder_::_%n folders_" => array("%n thư mục"),
+"_%n file_::_%n files_" => array("%n tập tin"),
+"{dirs} and {files}" => "{dirs} và {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("Đang tải lên %n tập tin"),
 "Your storage is full, files can not be updated or synced anymore!" => "Your storage is full, files can not be updated or synced anymore!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Your storage is almost full ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Mã hóa đã bị vô hiệu nhưng những tập tin của bạn vẫn được mã hóa. Vui lòng vào phần thiết lập cá nhân để giải mã chúng.",
 "Your download is being prepared. This might take some time if the files are big." => "Your download is being prepared. This might take some time if the files are big.",
+"Error moving file" => "Lỗi di chuyển tập tin",
 "Error" => "Lỗi",
 "Name" => "Tên",
 "Size" => "Kích cỡ",
 "Modified" => "Thay đổi",
+"%s could not be renamed" => "%s không thể đổi tên",
 "Upload" => "Tải lên",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
@@ -45,20 +66,21 @@ $TRANSLATIONS = array(
 "0 is unlimited" => "0 là không giới hạn",
 "Maximum input size for ZIP files" => "Kích thước tối đa cho các tập tin ZIP",
 "Save" => "Lưu",
-"New" => "Mới",
+"New" => "Tạo mới",
+"New text file" => "File text mới",
 "Text file" => "Tập tin văn bản",
 "New folder" => "Tạo thư mục",
 "Folder" => "Thư mục",
 "From link" => "Từ liên kết",
 "Deleted files" => "File đã bị xóa",
 "Cancel upload" => "Hủy upload",
+"You don’t have permission to upload or create files here" => "Bạn không có quyền upload hoặc tạo files ở đây",
 "Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
 "Download" => "Tải về",
 "Delete" => "Xóa",
 "Upload too large" => "Tập tin tải lên quá lớn",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ .",
 "Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
-"Current scanning" => "Hiện tại đang quét",
-"Upgrading filesystem cache..." => "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
+"Current scanning" => "Hiện tại đang quét"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index effcb0225c..87f8138697 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -3,6 +3,14 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "无法移动 %s - 同名文件已存在",
 "Could not move %s" => "无法移动 %s",
 "File name cannot be empty." => "文件名不能为空。",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
+"The name %s is already used in the folder %s. Please choose a different name." => "文件名 %s 是已经在 %s 中存在的名称。请使用其他名称。",
+"Not a valid source" => "不是一个可用的源",
+"Server is not allowed to open URLs, please check the server configuration" => "服务器没有允许打开URL网址，请检查服务器配置",
+"Error while downloading %s to %s" => "当下载 %s 到 %s 时出错",
+"Error when creating the file" => "当创建文件是出错",
+"Folder name cannot be empty." => "文件夹名称不能为空",
+"Error when creating the folder" => "创建文件夹出错",
 "Unable to set upload directory." => "无法设置上传文件夹。",
 "Invalid Token" => "无效密匙",
 "No file was uploaded. Unknown error" => "没有文件被上传。未知错误",
@@ -14,30 +22,44 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "缺少临时目录",
 "Failed to write to disk" => "写入磁盘失败",
 "Not enough storage available" => "没有足够的存储空间",
+"Upload failed. Could not find uploaded file" => "上传失败。不能发现上传的文件",
+"Upload failed. Could not get file info." => "上传失败。不能获取文件信息。",
 "Invalid directory." => "无效文件夹。",
 "Files" => "文件",
-"Not enough space available" => "没有足够可用空间",
+"Unable to upload {filename} as it is a directory or has 0 bytes" => "不能上传文件 {filename} ，由于它是一个目录或者为0字节",
 "Upload cancelled." => "上传已取消",
+"Could not get result from server." => "不能从服务器得到结果",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
+"URL cannot be empty" => "URL不能为空",
+"In the home folder 'Shared' is a reserved filename" => "主目录里 'Shared' 是系统预留目录名",
 "{new_name} already exists" => "{new_name} 已存在",
+"Could not create file" => "不能创建文件",
+"Could not create folder" => "不能创建文件夹",
+"Error fetching URL" => "获取URL出错",
 "Share" => "分享",
 "Delete permanently" => "永久删除",
 "Rename" => "重命名",
 "Pending" => "等待",
+"Could not rename file" => "不能重命名文件",
 "replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
 "undo" => "撤销",
+"Error deleting file." => "删除文件出错。",
 "_%n folder_::_%n folders_" => array("%n 文件夹"),
 "_%n file_::_%n files_" => array("%n个文件"),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"'.' is an invalid file name." => "'.' 是一个无效的文件名。",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
+"{dirs} and {files}" => "{dirs} 和 {files}",
+"_Uploading %n file_::_Uploading %n files_" => array("上传 %n 个文件"),
 "Your storage is full, files can not be updated or synced anymore!" => "您的存储空间已满，文件将无法更新或同步！",
 "Your storage is almost full ({usedSpacePercent}%)" => "您的存储空间即将用完 ({usedSpacePercent}%)",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
+"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
+"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。",
 "Your download is being prepared. This might take some time if the files are big." => "下载正在准备中。如果文件较大可能会花费一些时间。",
+"Error moving file" => "移动文件错误",
 "Error" => "错误",
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
+"Invalid folder name. Usage of 'Shared' is reserved." => "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹",
 "%s could not be renamed" => "%s 不能被重命名",
 "Upload" => "上传",
 "File handling" => "文件处理",
@@ -49,19 +71,20 @@ $TRANSLATIONS = array(
 "Maximum input size for ZIP files" => "ZIP 文件的最大输入大小",
 "Save" => "保存",
 "New" => "新建",
+"New text file" => "创建文本文件",
 "Text file" => "文本文件",
 "New folder" => "添加文件夹",
 "Folder" => "文件夹",
 "From link" => "来自链接",
 "Deleted files" => "已删除文件",
 "Cancel upload" => "取消上传",
+"You don’t have permission to upload or create files here" => "您没有权限来上传湖州哦和创建文件",
 "Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧！",
 "Download" => "下载",
 "Delete" => "删除",
 "Upload too large" => "上传文件过大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
 "Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
-"Current scanning" => "当前扫描",
-"Upgrading filesystem cache..." => "正在更新文件系统缓存..."
+"Current scanning" => "当前扫描"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index dd9cbfdf1a..caf8b184a3 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -3,13 +3,12 @@ $TRANSLATIONS = array(
 "Could not move %s - File with this name already exists" => "無法移動 %s ，同名的檔案已經存在",
 "Could not move %s" => "無法移動 %s",
 "File name cannot be empty." => "檔名不能為空",
-"File name must not contain \"/\". Please choose a different name." => "檔名不能包含 \"/\" ，請選其他名字",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 \\ / < > : \" | ? * 字元",
 "The name %s is already used in the folder %s. Please choose a different name." => "%s 已經被使用於資料夾 %s ，請換一個名字",
 "Not a valid source" => "不是有效的來源",
 "Error while downloading %s to %s" => "下載 %s 到 %s 失敗",
 "Error when creating the file" => "建立檔案失敗",
 "Folder name cannot be empty." => "資料夾名稱不能留空",
-"Folder name must not contain \"/\". Please choose a different name." => "資料夾名稱不能包含 \"/\" ，請選其他名字",
 "Error when creating the folder" => "建立資料夾失敗",
 "Unable to set upload directory." => "無法設定上傳目錄",
 "Invalid Token" => "無效的 token",
@@ -22,12 +21,11 @@ $TRANSLATIONS = array(
 "Missing a temporary folder" => "找不到暫存資料夾",
 "Failed to write to disk" => "寫入硬碟失敗",
 "Not enough storage available" => "儲存空間不足",
-"Upload failed. Could not get file info." => "上傳失敗，無法取得檔案資訊",
 "Upload failed. Could not find uploaded file" => "上傳失敗，找不到上傳的檔案",
+"Upload failed. Could not get file info." => "上傳失敗，無法取得檔案資訊",
 "Invalid directory." => "無效的資料夾",
 "Files" => "檔案",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "因為 {filename} 是個目錄或是大小為零，所以無法上傳",
-"Not enough space available" => "沒有足夠的可用空間",
 "Upload cancelled." => "上傳已取消",
 "Could not get result from server." => "無法從伺服器取回結果",
 "File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中，離開此頁面將會取消上傳。",
@@ -47,8 +45,6 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n 個檔案"),
 "{dirs} and {files}" => "{dirs} 和 {files}",
 "_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案正在上傳"),
-"'.' is an invalid file name." => "'.' 是不合法的檔名",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 \\ / < > : \" | ? * 字元",
 "Your storage is full, files can not be updated or synced anymore!" => "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
 "Your storage is almost full ({usedSpacePercent}%)" => "您的儲存空間快要滿了 ({usedSpacePercent}%)",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
@@ -84,7 +80,6 @@ $TRANSLATIONS = array(
 "Upload too large" => "上傳過大",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案大小超過伺服器的限制。",
 "Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
-"Current scanning" => "正在掃描",
-"Upgrading filesystem cache..." => "正在升級檔案系統快取…"
+"Current scanning" => "正在掃描"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index b9e41a352b..c41e2d1558 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -51,17 +51,20 @@ class Helper
 	/**
 	 * Comparator function to sort files alphabetically and have
 	 * the directories appear first
-	 * @param array $a file
-	 * @param array $b file
-	 * @return -1 if $a must come before $b, 1 otherwise
+	 *
+	 * @param \OCP\Files\FileInfo $a file
+	 * @param \OCP\Files\FileInfo $b file
+	 * @return int -1 if $a must come before $b, 1 otherwise
 	 */
 	public static function fileCmp($a, $b) {
-		if ($a['type'] === 'dir' and $b['type'] !== 'dir') {
+		$aType = $a->getType();
+		$bType = $b->getType();
+		if ($aType === 'dir' and $bType !== 'dir') {
 			return -1;
-		} elseif ($a['type'] !== 'dir' and $b['type'] === 'dir') {
+		} elseif ($aType !== 'dir' and $bType === 'dir') {
 			return 1;
 		} else {
-			return strnatcasecmp($a['name'], $b['name']);
+			return strnatcasecmp($a->getName(), $b->getName());
 		}
 	}
 
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index ed15e46a5a..34acd9c4f5 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -5,15 +5,15 @@
 			<div id="new" class="button">
 				<a><?php p($l->t('New'));?></a>
 				<ul>
-					<li class="icon icon-filetype-text"
+					<li class="icon-filetype-text svg"
 						data-type="file" data-newname="<?php p($l->t('New text file')) ?>.txt">
 						<p><?php p($l->t('Text file'));?></p>
 					</li>
-					<li class="icon icon-filetype-folder"
+					<li class="icon-filetype-folder svg"
 						data-type="folder" data-newname="<?php p($l->t('New folder')) ?>">
 						<p><?php p($l->t('Folder'));?></p>
 					</li>
-					<li class="icon icon-link" data-type="web">
+					<li class="icon-link svg" data-type="web">
 						<p><?php p($l->t('From link'));?></p>
 					</li>
 				</ul>
@@ -35,7 +35,7 @@
 					<input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir">
 					<input type="file" id="file_upload_start" name='files[]'
 						   data-url="<?php print_unescaped(OCP\Util::linkTo('files', 'ajax/upload.php')); ?>" />
-					<a href="#" class="svg icon icon-upload"></a>
+					<a href="#" class="svg icon-upload"></a>
 			</div>
 			<?php if ($_['trash']): ?>
 			<input id="trash" type="button" value="<?php p($l->t('Deleted files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?> />
@@ -66,7 +66,7 @@
 					<input type="checkbox" id="select_all" />
 					<label for="select_all"></label>
 					<span class="name"><?php p($l->t( 'Name' )); ?></span>
-					<span class="selectedActions">
+					<span id="selectedActionsList" class="selectedActions">
 						<?php if($_['allowZipDownload']) : ?>
 							<a href="" class="download">
 								<img class="svg" alt="Download"
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 2a0df62276..69b4cbca10 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,4 +1,4 @@
-<div class="crumb <?php if(!count($_["breadcrumb"])) p('last');?>" data-dir=''>
+<div class="crumb svg <?php if(!count($_["breadcrumb"])) p('last');?>" data-dir=''>
 	<a href="<?php print_unescaped($_['baseURL']); ?>">
 		<?php if(isset($_['rootBreadCrumb'])):
 			echo $_['rootBreadCrumb'];
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index f4fb96a7a7..8a7a1e370e 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -17,7 +17,13 @@ $totalsize = 0; ?>
 		data-mime="<?php p($file['mimetype'])?>"
 		data-size="<?php p($file['size']);?>"
 		data-etag="<?php p($file['etag']);?>"
-		data-permissions="<?php p($file['permissions']); ?>">
+		data-permissions="<?php p($file['permissions']); ?>"
+
+		<?php if(isset($file['displayname_owner'])): ?>
+			data-share-owner="<?php p($file['displayname_owner']) ?>"
+		<?php endif; ?>
+		>
+
 		<?php if(isset($file['isPreviewAvailable']) and $file['isPreviewAvailable']): ?>
 		<td class="filename svg preview-icon"
 		<?php else: ?>
@@ -34,17 +40,15 @@ $totalsize = 0; ?>
 				<span class="nametext">
 					<?php print_unescaped(htmlspecialchars($file['name']));?>
 				</span>
+				<span class="uploadtext" currentUploads="0">
+				</span>
+			</a>
 		<?php else: ?>
 			<a class="name" href="<?php p(rtrim($_['downloadURL'],'/').'/'.trim($directory,'/').'/'.$name); ?>">
 				<label class="filetext" title="" for="select-<?php p($file['fileid']); ?>"></label>
 				<span class="nametext"><?php print_unescaped(htmlspecialchars($file['basename']));?><span class='extension'><?php p($file['extension']);?></span></span>
 			</a>
 		<?php endif; ?>
-			<?php if($file['type'] == 'dir'):?>
-				<span class="uploadtext" currentUploads="0">
-				</span>
-			<?php endif;?>
-			</a>
 		</td>
 		<td class="filesize"
 			style="color:rgb(<?php p($simple_size_color.','.$simple_size_color.','.$simple_size_color) ?>)">
diff --git a/apps/files/templates/upgrade.php b/apps/files/templates/upgrade.php
deleted file mode 100644
index e03f086e47..0000000000
--- 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/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
new file mode 100644
index 0000000000..2b4341ef1c
--- /dev/null
+++ b/apps/files/tests/js/fileUploadSpec.js
@@ -0,0 +1,127 @@
+/**
+* ownCloud
+*
+* @author Vincent Petry
+* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+/* global OC */
+describe('OC.Upload tests', function() {
+	var $dummyUploader;
+	var testFile;
+
+	beforeEach(function() {
+		testFile = {
+			name: 'test.txt',
+			size: 5000, // 5 KB
+			type: 'text/plain',
+			lastModifiedDate: new Date()
+		};
+		// need a dummy button because file-upload checks on it
+		$('#testArea').append(
+			'<input type="file" id="file_upload_start" name="files[]" multiple="multiple">' +
+			'<input type="hidden" id="upload_limit" name="upload_limit" value="10000000">' + // 10 MB
+			'<input type="hidden" id="free_space" name="free_space" value="50000000">' // 50 MB
+		);
+		$dummyUploader = $('#file_upload_start');
+	});
+	afterEach(function() {
+		delete window.file_upload_param;
+		$dummyUploader = undefined;
+	});
+	describe('Adding files for upload', function() {
+		var params;
+		var failStub;
+
+		beforeEach(function() {
+			params = OC.Upload.init();
+			failStub = sinon.stub();
+			$dummyUploader.on('fileuploadfail', failStub);
+		});
+		afterEach(function() {
+			params = undefined;
+			failStub = undefined;
+		});
+
+		/**
+		 * Add file for upload
+		 * @param file file data
+		 */
+		function addFile(file) {
+			return params.add.call(
+					$dummyUploader[0],
+					{},
+					{
+					originalFiles: {},
+					files: [file]
+				});
+		}
+
+		it('adds file when size is below limits', function() {
+			var result = addFile(testFile);
+			expect(result).toEqual(true);
+		});
+		it('adds file when free space is unknown', function() {
+			var result;
+			$('#free_space').val(-2);
+
+			result = addFile(testFile);
+
+			expect(result).toEqual(true);
+			expect(failStub.notCalled).toEqual(true);
+		});
+		it('does not add file if it exceeds upload limit', function() {
+			var result;
+			$('#upload_limit').val(1000);
+
+			result = addFile(testFile);
+
+			expect(result).toEqual(false);
+			expect(failStub.calledOnce).toEqual(true);
+			expect(failStub.getCall(0).args[1].textStatus).toEqual('sizeexceedlimit');
+			expect(failStub.getCall(0).args[1].errorThrown).toEqual(
+				'Total file size 5 kB exceeds upload limit 1000 B'
+			);
+		});
+		it('does not add file if it exceeds free space', function() {
+			var result;
+			$('#free_space').val(1000);
+
+			result = addFile(testFile);
+
+			expect(result).toEqual(false);
+			expect(failStub.calledOnce).toEqual(true);
+			expect(failStub.getCall(0).args[1].textStatus).toEqual('notenoughspace');
+			expect(failStub.getCall(0).args[1].errorThrown).toEqual(
+				'Not enough free space, you are uploading 5 kB but only 1000 B is left'
+			);
+		});
+		it('does not add file if it has invalid characters', function() {
+			var result;
+			testFile.name = 'stars*stars.txt';
+
+			result = addFile(testFile);
+
+			expect(result).toEqual(false);
+			expect(failStub.calledOnce).toEqual(true);
+			expect(failStub.getCall(0).args[1].textStatus).toEqual('invalidcharacters');
+			expect(failStub.getCall(0).args[1].errorThrown.substr(0, 12)).toEqual(
+				'Invalid name'
+			);
+		});
+	});
+});
diff --git a/apps/files/tests/js/filesSpec.js b/apps/files/tests/js/filesSpec.js
index 018c8ef0f3..95bf87e03e 100644
--- a/apps/files/tests/js/filesSpec.js
+++ b/apps/files/tests/js/filesSpec.js
@@ -48,6 +48,41 @@ describe('Files tests', function() {
 				expect(error).toEqual(false);
 			}
 		});
+		it('Validates correct file names do not create Shared folder in root', function() {
+			// create shared file in subfolder
+			var error = false;
+			try {
+				expect(Files.isFileNameValid('shared', '/foo')).toEqual(true);
+				expect(Files.isFileNameValid('Shared', '/foo')).toEqual(true);
+			}
+			catch (e) {
+				error = e;
+			}
+			expect(error).toEqual(false);
+
+			// create shared file in root
+			var threwException = false;
+			try {
+				Files.isFileNameValid('Shared', '/');
+				console.error('Invalid file name not detected');
+			}
+			catch (e) {
+				threwException = true;
+			}
+			expect(threwException).toEqual(true);
+
+			// create shared file in root
+			var threwException = false;
+			try {
+				Files.isFileNameValid('shared', '/');
+				console.error('Invalid file name not detected');
+			}
+			catch (e) {
+				threwException = true;
+			}
+			expect(threwException).toEqual(true);
+
+		});
 		it('Detects invalid file names', function() {
 			var fileNames = [
 				'',
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index b6d9d6bb0a..15a09a29f5 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>The ownCloud files encryption system provides server side-encryption. After the app was enabled you need to re-login to initialize your encryption keys.</description>
+	<description>The ownCloud files encryption system provides server side-encryption. After the app is enabled you need to re-login to initialize your encryption keys. Please note that server side encryption requires that the ownCloud server admin can be trusted. The main purpose of this app is the encryption of files that are stored on externally mounted storages.</description>
 	<licence>AGPL</licence>
 	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
 	<require>4</require>
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index 45a0c4616f..345c01a0d4 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,6 +1,44 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "جاري الحفظ...",
-"Encryption" => "التشفير"
+"Recovery key successfully enabled" => "تم بنجاح تفعيل مفتاح الاستعادة",
+"Could not enable recovery key. Please check your recovery key password!" => "لا يمكن تفعيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
+"Recovery key successfully disabled" => "تم تعطيل مفتاح الاستعادة بنجاح",
+"Could not disable recovery key. Please check your recovery key password!" => "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
+"Password successfully changed." => "تم تغيير كلمة المرور بنجاح.",
+"Could not change the password. Maybe the old password was not correct." => "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+"Private key password successfully updated." => "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
+"Could not update the private key password. Maybe the old password was not correct." => "لا يمكن تحديث كلمة مرور المفتاح الخاص. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "برنامج التشفير لم يتم تهيئتة ! من الممكن ان برنامج التشفير تم اعادة تفعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشفير.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "مفتاحك الخاص غير صالح! ربما تم تغيير كلمة المرور خارج %s (مثل:مجلد شركتك). يمكنك تحديث كلمة المرور في الاعدادات الشخصية لإستعادة الوصول الى ملفاتك المشفرة.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.",
+"Unknown error please check your system settings or contact your administrator" => "خطا غير معروف يرجى التاكد من اعدادات نظامك او تواصل مع المدير.",
+"Missing requirements." => "متطلبات ناقصة.",
+"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" => "التشفير",
+"Enable recovery key (allow to recover users files in case of password loss):" => "تفعيل استعادة المفتاح (سوف يمكنك من استعادة ملفات المستخدمين في حال فقدان كلمة المرور):",
+"Recovery key password" => "استعادة كلمة مرور المفتاح",
+"Repeat Recovery key password" => "كرر كلمة المرور لـ استعادة المفتاح",
+"Enabled" => "مفعلة",
+"Disabled" => "معطلة",
+"Change recovery key password:" => "تعديل كلمة المرور استعادة المفتاح:",
+"Old Recovery key password" => "كلمة المرور القديمة لـ استعامة المفتاح",
+"New Recovery key password" => "تعيين كلمة مرور جديدة لـ استعادة المفتاح",
+"Repeat New Recovery key password" => "كرر كلمة المرور لـ استعادة المفتاح من جديد",
+"Change Password" => "عدل كلمة السر",
+"Your private key password no longer match your log-in password:" => "كلمة مرور مفتاحك الخاص لا تتطابق مع كلمة المرور الخاصة الدخول:",
+"Set your old private key password to your current log-in password." => "تعيين كلمة المرور القديمة لـ المفتاح الخاص الى كلمة المرور الخاصة بالدخول الحالية.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك.",
+"Old log-in password" => "كلمة المرور القديمة الخاصة بالدخول",
+"Current log-in password" => "كلمة المرور الحالية الخاصة بالدخول",
+"Update Private Key Password" => "تحديث كلمة المرور لـ المفتاح الخاص",
+"Enable password recovery:" => "تفعيل استعادة كلمة المرور:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور",
+"File recovery settings updated" => "اعدادات ملف الاستعادة تم تحديثه",
+"Could not update file recovery" => "تعذر تحديث ملف الاستعادة"
 );
 $PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index 9060c92ed4..a40781125d 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "Записване...",
 "Encryption" => "Криптиране"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index 5fc4f6a13f..63e335bd2b 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "সংরক্ষণ করা হচ্ছে..",
 "Encryption" => "সংকেতায়ন"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 33d2754483..3414796f62 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -16,7 +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.",
-"Saving..." => "Desant...",
+"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_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index cf2776371d..cdeaf5b192 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -16,7 +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." => "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta.",
 "Following users are not set up for encryption:" => "Následující uživatelé nemají nastavené šifrování:",
 "Initial encryption started... This can take some time. Please wait." => "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počkejte prosím.",
-"Saving..." => "Ukládám...",
+"Initial encryption running... Please try again later." => "Probíhá počáteční šifrování... Zkuste to prosím znovu později.",
 "Go directly to your " => "Běžte přímo do vašeho",
 "personal settings" => "osobní nastavení",
 "Encryption" => "Šifrování",
diff --git a/apps/files_encryption/l10n/cy_GB.php b/apps/files_encryption/l10n/cy_GB.php
index ea8b19963b..6d3b898d00 100644
--- a/apps/files_encryption/l10n/cy_GB.php
+++ b/apps/files_encryption/l10n/cy_GB.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "Yn cadw...",
 "Encryption" => "Amgryptiad"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index 9e4290534c..f0f1580049 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -16,7 +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." => "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
 "Following users are not set up for encryption:" => "Følgende brugere er ikke sat op til kryptering:",
 "Initial encryption started... This can take some time. Please wait." => "Førstegangskryptering er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
-"Saving..." => "Gemmer...",
+"Initial encryption running... Please try again later." => "Kryptering foretages... Prøv venligst igen senere.",
 "Go directly to your " => "Gå direkte til din ",
 "personal settings" => "Personlige indstillinger",
 "Encryption" => "Kryptering",
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 3ba50f074b..38bfa7f024 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -16,7 +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." => "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
 "Initial encryption started... This can take some time. Please wait." => "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
-"Saving..." => "Speichern...",
+"Initial encryption running... Please try again later." => "Initiale Verschlüsselung läuft... Bitte versuche es später wieder.",
 "Go directly to your " => "Direkt wechseln zu Deinem",
 "personal settings" => "Private Einstellungen",
 "Encryption" => "Verschlüsselung",
diff --git a/apps/files_encryption/l10n/de_CH.php b/apps/files_encryption/l10n/de_CH.php
index a31e82a666..875efa84f2 100644
--- a/apps/files_encryption/l10n/de_CH.php
+++ b/apps/files_encryption/l10n/de_CH.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Missing requirements." => "Fehlende Voraussetzungen",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
-"Saving..." => "Speichern...",
 "personal settings" => "Persönliche Einstellungen",
 "Encryption" => "Verschlüsselung",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 6184fd8a89..13f7718b93 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -15,8 +15,8 @@ $TRANSLATIONS = array(
 "Missing requirements." => "Fehlende Voraussetzungen",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
-"Initial encryption started... This can take some time. Please wait." => "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
-"Saving..." => "Speichern...",
+"Initial encryption started... This can take some time. Please wait." => "Anfangsverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
+"Initial encryption running... Please try again later." => "Anfangsverschlüsselung läuft... Bitte versuchen Sie es später wieder.",
 "Go directly to your " => "Direkt wechseln zu Ihrem",
 "personal settings" => "Persönliche Einstellungen",
 "Encryption" => "Verschlüsselung",
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 22c1095e28..ad8617bc6d 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -16,7 +16,6 @@ $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 μαζί με το PHP extension είναι ενεργοποιήμένο και έχει ρυθμιστεί σωστά. Προς το παρόν, η εφαρμογή κρυπτογράφησης είναι απενεργοποιημένη.",
 "Following users are not set up for encryption:" => "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:",
 "Initial encryption started... This can take some time. Please wait." => "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπορεί να πάρει κάποια ώρα. Παρακαλώ περιμένετε.",
-"Saving..." => "Γίνεται αποθήκευση...",
 "Go directly to your " => "Πηγαίνε απευθείας στο ",
 "personal settings" => "προσωπικές ρυθμίσεις",
 "Encryption" => "Κρυπτογράφηση",
diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php
index 55d56b9533..2087ea4b8b 100644
--- a/apps/files_encryption/l10n/en_GB.php
+++ b/apps/files_encryption/l10n/en_GB.php
@@ -16,7 +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." => "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.",
 "Following users are not set up for encryption:" => "Following users are not set up for encryption:",
 "Initial encryption started... This can take some time. Please wait." => "Initial encryption started... This can take some time. Please wait.",
-"Saving..." => "Saving...",
+"Initial encryption running... Please try again later." => "Initial encryption running... Please try again later.",
 "Go directly to your " => "Go directly to your ",
 "personal settings" => "personal settings",
 "Encryption" => "Encryption",
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index e14c7cd7ac..05d30f2f6c 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -4,7 +4,6 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
 "Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
 "Missing requirements." => "Mankas neproj.",
-"Saving..." => "Konservante...",
 "Go directly to your " => "Iri direkte al via",
 "personal settings" => "persona agordo",
 "Encryption" => "Ĉifrado",
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 5345398688..cf45437c0e 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -16,7 +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." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
 "Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
 "Initial encryption started... This can take some time. Please wait." => "Encriptación iniciada..... Esto puede tomar un tiempo. Por favor espere.",
-"Saving..." => "Guardando...",
+"Initial encryption running... Please try again later." => "Cifrado inicial en curso... Inténtelo más tarde.",
 "Go directly to your " => "Ir directamente a su",
 "personal settings" => "opciones personales",
 "Encryption" => "Cifrado",
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index df5bd649d6..bc1eedbf5e 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -8,19 +8,26 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
 "Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
 "Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Tu llave privada no es válida! Aparenta que tu clave fue cambiada fuera de %s (de tus directorios). Puedes actualizar la contraseña de tu clave privadaen las configuraciones personales para recobrar el acceso a tus archivos encriptados.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo.",
+"Unknown error please check your system settings or contact your administrator" => "Error desconocido, por favor chequea la configuración de tu sistema o contacte a su administrador",
 "Missing requirements." => "Requisitos incompletos.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada.",
 "Following users are not set up for encryption:" => "Los siguientes usuarios no fueron configurados para encriptar:",
-"Saving..." => "Guardando...",
+"Initial encryption started... This can take some time. Please wait." => "Encriptación inicial comenzada... Esto puede durar un tiempo. Por favor espere.",
+"Go directly to your " => "Ve directamente a tu",
 "personal settings" => "Configuración personal",
 "Encryption" => "Encriptación",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso que pierdas la contraseña):",
 "Recovery key password" => "Contraseña de recuperación de clave",
+"Repeat Recovery key password" => "Repetir la contraseña de la clave de recuperación",
 "Enabled" => "Habilitado",
 "Disabled" => "Deshabilitado",
 "Change recovery key password:" => "Cambiar contraseña para recuperar la clave:",
 "Old Recovery key password" => "Contraseña antigua de recuperación de clave",
 "New Recovery key password" => "Nueva contraseña de recuperación de clave",
+"Repeat New Recovery key password" => "Repetir Nueva contraseña para la clave de recuperación",
 "Change Password" => "Cambiar contraseña",
 "Your private key password no longer match your log-in password:" => "Tu contraseña de clave privada ya no coincide con la contraseña de ingreso:",
 "Set your old private key password to your current log-in password." => "Usá tu contraseña de clave privada antigua para tu contraseña de ingreso actual.",
diff --git a/apps/files_encryption/l10n/es_MX.php b/apps/files_encryption/l10n/es_MX.php
index 3906e3cacb..e2915f8e71 100644
--- a/apps/files_encryption/l10n/es_MX.php
+++ b/apps/files_encryption/l10n/es_MX.php
@@ -16,7 +16,6 @@ $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." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
 "Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
 "Initial encryption started... This can take some time. Please wait." => "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.",
-"Saving..." => "Guardando...",
 "Go directly to your " => "Ir directamente a su",
 "personal settings" => "opciones personales",
 "Encryption" => "Cifrado",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 9182c5ef19..dcf035289f 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -16,7 +16,6 @@ $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." => "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
 "Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:",
 "Initial encryption started... This can take some time. Please wait." => "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.",
-"Saving..." => "Salvestamine...",
 "Go directly to your " => "Liigu otse oma",
 "personal settings" => "isiklikes seadetes",
 "Encryption" => "Krüpteerimine",
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 6b1bafdda1..9d51ebba2b 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -16,7 +16,6 @@ $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." => "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago.",
 "Following users are not set up for encryption:" => "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
 "Initial encryption started... This can take some time. Please wait." => "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
-"Saving..." => "Gordetzen...",
 "Go directly to your " => "Joan zuzenean zure",
 "personal settings" => "ezarpen pertsonalak",
 "Encryption" => "Enkriptazioa",
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index ed044a4158..3f8d631e10 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -9,7 +9,6 @@ $TRANSLATIONS = array(
 "Private key password successfully updated." => "رمزعبور کلید خصوصی با موفقیت به روز شد.",
 "Could not update the private key password. Maybe the old password was not correct." => "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.",
 "Missing requirements." => "نیازمندی های گمشده",
-"Saving..." => "در حال ذخیره سازی...",
 "personal settings" => "تنظیمات شخصی",
 "Encryption" => "رمزگذاری",
 "Enable recovery key (allow to recover users files in case of password loss):" => "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):",
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index b3df41b1f4..6a0025cd98 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -3,8 +3,8 @@ $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Palautusavain kytketty päälle onnistuneesti",
 "Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
 "Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+"Private key password successfully updated." => "Yksityisen avaimen salasana päivitetty onnistuneesti.",
 "Following users are not set up for encryption:" => "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
-"Saving..." => "Tallennetaan...",
 "personal settings" => "henkilökohtaiset asetukset",
 "Encryption" => "Salaus",
 "Recovery key password" => "Palautusavaimen salasana",
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index dbccbf74dc..a68b6a7132 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -16,7 +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." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.",
 "Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
 "Initial encryption started... This can take some time. Please wait." => "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.",
-"Saving..." => "Enregistrement...",
+"Initial encryption running... Please try again later." => "Chiffrement initial en cours... Veuillez re-essayer ultérieurement.",
 "Go directly to your " => "Allez directement à votre",
 "personal settings" => "paramètres personnel",
 "Encryption" => "Chiffrement",
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 7b3c899d1f..08567ef276 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -16,7 +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." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado.",
 "Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:",
 "Initial encryption started... This can take some time. Please wait." => "Comezou o cifrado inicial... Isto pode levar bastante tempo. Agarde.",
-"Saving..." => "Gardando...",
+"Initial encryption running... Please try again later." => "O cifrado inicial está en execución... Tenteo máis tarde.",
 "Go directly to your " => "Vaia directamente ao seu",
 "personal settings" => "axustes persoais",
 "Encryption" => "Cifrado",
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
index cdf29c9b0a..ca8783d196 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "שמירה…",
 "Encryption" => "הצפנה"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 163011ff80..a80c8d6f36 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -16,7 +16,6 @@ $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." => "Kérem gondoskodjon arról, hogy PHP 5.3.3 vagy annál frissebb legyen telepítve, továbbá az OpenSSL a megfelelő PHP-bővítménnyel együtt rendelkezésre álljon és helyesen legyen konfigurálva! A titkosító modul egyelőre kikapcsolásra került.",
 "Following users are not set up for encryption:" => "A következő felhasználók nem állították be a titkosítást:",
 "Initial encryption started... This can take some time. Please wait." => "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltarthat. Kérem várjon.",
-"Saving..." => "Mentés...",
 "Go directly to your " => "Ugrás ide:",
 "personal settings" => "személyes beállítások",
 "Encryption" => "Titkosítás",
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index a719d44582..a4c3ae547c 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Missing requirements." => "Persyaratan yang hilang.",
 "Following users are not set up for encryption:" => "Pengguna berikut belum diatur untuk enkripsi:",
 "Initial encryption started... This can take some time. Please wait." => "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
-"Saving..." => "Menyimpan...",
 "Go directly to your " => "Langsung ke anda",
 "personal settings" => "pengaturan pribadi",
 "Encryption" => "Enkripsi",
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
index 27c0904a53..7b7a403b46 100644
--- a/apps/files_encryption/l10n/is.php
+++ b/apps/files_encryption/l10n/is.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "Er að vista ...",
 "Encryption" => "Dulkóðun"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index fc1aaffc02..42ee846a76 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -16,7 +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." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
 "Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
 "Initial encryption started... This can take some time. Please wait." => "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.",
-"Saving..." => "Salvataggio in corso...",
+"Initial encryption running... Please try again later." => "Cifratura iniziale in esecuzione... Riprova più tardi.",
 "Go directly to your " => "Passa direttamente a",
 "personal settings" => "impostazioni personali",
 "Encryption" => "Cifratura",
diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php
new file mode 100644
index 0000000000..476566e00f
--- /dev/null
+++ b/apps/files_encryption/l10n/ja.php
@@ -0,0 +1,44 @@
+<?php
+$TRANSLATIONS = array(
+"Recovery key successfully enabled" => "リカバリ用のキーを正常に有効にしました",
+"Could not enable recovery key. Please check your recovery key password!" => "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認してください！",
+"Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
+"Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
+"Password successfully changed." => "パスワードを変更できました。",
+"Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+"Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
+"Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "プライベートキーが有効ではありません！パスワードが%sの外部で変更された(例: 共同ディレクトリ)と思われます。個人設定でプライベートキーのパスワードを更新して、暗号化ファイルへのアクセスを回復することができます。",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
+"Unknown error please check your system settings or contact your administrator" => "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。",
+"Missing requirements." => "必要要件が満たされていません。",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。",
+"Following users are not set up for encryption:" => "以下のユーザーは、暗号化設定がされていません：",
+"Initial encryption started... This can take some time. Please wait." => "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。お待ちください。",
+"Initial encryption running... Please try again later." => "初期暗号化実行中... 後でもう一度お試しください。",
+"Go directly to your " => "あなたのディレクトリへ",
+"personal settings" => "秘密鍵をアンロックできます",
+"Encryption" => "暗号化",
+"Enable recovery key (allow to recover users files in case of password loss):" => "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):",
+"Recovery key password" => "リカバリキーのパスワード",
+"Repeat Recovery key password" => "リカバリキーのパスワードをもう一度入力",
+"Enabled" => "有効",
+"Disabled" => "無効",
+"Change recovery key password:" => "リカバリキーのパスワードを変更:",
+"Old Recovery key password" => "古いリカバリキーのパスワード",
+"New Recovery key password" => "新しいリカバリキーのパスワード",
+"Repeat New Recovery key password" => "新しいリカバリキーのパスワードをもう一度入力",
+"Change Password" => "パスワードを変更",
+"Your private key password no longer match your log-in password:" => "もはや秘密鍵はログインパスワードと一致しません:",
+"Set your old private key password to your current log-in password." => "古い秘密鍵のパスワードを現在のログインパスワードに設定する。",
+" If you don't remember your old password you can ask your administrator to recover your files." => "古いパスワードを覚えていない場合、管理者に尋ねてファイルを回復することができます。",
+"Old log-in password" => "古いログインパスワード",
+"Current log-in password" => "現在のログインパスワード",
+"Update Private Key Password" => "秘密鍵のパスワードを更新",
+"Enable password recovery:" => "パスワードリカバリを有効に:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。",
+"File recovery settings updated" => "ファイルリカバリ設定を更新しました",
+"Could not update file recovery" => "ファイルリカバリを更新できませんでした"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 1206969746..476566e00f 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,34 +1,34 @@
 <?php
 $TRANSLATIONS = array(
-"Recovery key successfully enabled" => "リカバリ用のキーは正常に有効化されました",
-"Could not enable recovery key. Please check your recovery key password!" => "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認して下さい！",
+"Recovery key successfully enabled" => "リカバリ用のキーを正常に有効にしました",
+"Could not enable recovery key. Please check your recovery key password!" => "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認してください！",
 "Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
-"Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認して下さい！",
+"Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
 "Password successfully changed." => "パスワードを変更できました。",
 "Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
 "Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
 "Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "暗号化アプリが初期化されていません。暗号化アプリが接続中に再度有効かされた可能性があります。暗号化アプリを初期化する為に、１回ログアウトしてログインしなおしてください。",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "プライベートキーが有効ではありません！パスワードが%sの外部で変更された(例: 共同ディレクトリ)と思われます。個人設定でプライベートキーのパスワードを更新して、暗号化ファイルへのアクセスを回復することができます。",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
 "Unknown error please check your system settings or contact your administrator" => "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。",
 "Missing requirements." => "必要要件が満たされていません。",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。",
 "Following users are not set up for encryption:" => "以下のユーザーは、暗号化設定がされていません：",
-"Initial encryption started... This can take some time. Please wait." => "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。今しばらくお待ちください。",
-"Saving..." => "保存中...",
+"Initial encryption started... This can take some time. Please wait." => "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。お待ちください。",
+"Initial encryption running... Please try again later." => "初期暗号化実行中... 後でもう一度お試しください。",
 "Go directly to your " => "あなたのディレクトリへ",
 "personal settings" => "秘密鍵をアンロックできます",
 "Encryption" => "暗号化",
-"Enable recovery key (allow to recover users files in case of password loss):" => "復旧キーを有効化 (万一パスワードを亡くした場合もユーザーのファイルを回復できる):",
-"Recovery key password" => "復旧キーのパスワード",
-"Repeat Recovery key password" => "復旧キーのパスワードをもう一度入力",
+"Enable recovery key (allow to recover users files in case of password loss):" => "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):",
+"Recovery key password" => "リカバリキーのパスワード",
+"Repeat Recovery key password" => "リカバリキーのパスワードをもう一度入力",
 "Enabled" => "有効",
 "Disabled" => "無効",
-"Change recovery key password:" => "復旧キーのパスワードを変更:",
-"Old Recovery key password" => "古い復旧キーのパスワード",
-"New Recovery key password" => "新しい復旧キーのパスワード",
-"Repeat New Recovery key password" => "新しい復旧キーのパスワードをもう一度入力",
+"Change recovery key password:" => "リカバリキーのパスワードを変更:",
+"Old Recovery key password" => "古いリカバリキーのパスワード",
+"New Recovery key password" => "新しいリカバリキーのパスワード",
+"Repeat New Recovery key password" => "新しいリカバリキーのパスワードをもう一度入力",
 "Change Password" => "パスワードを変更",
 "Your private key password no longer match your log-in password:" => "もはや秘密鍵はログインパスワードと一致しません:",
 "Set your old private key password to your current log-in password." => "古い秘密鍵のパスワードを現在のログインパスワードに設定する。",
@@ -36,9 +36,9 @@ $TRANSLATIONS = array(
 "Old log-in password" => "古いログインパスワード",
 "Current log-in password" => "現在のログインパスワード",
 "Update Private Key Password" => "秘密鍵のパスワードを更新",
-"Enable password recovery:" => "パスワード復旧を有効化:",
+"Enable password recovery:" => "パスワードリカバリを有効に:",
 "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。",
-"File recovery settings updated" => "ファイル復旧設定が更新されました",
-"Could not update file recovery" => "ファイル復旧を更新できませんでした"
+"File recovery settings updated" => "ファイルリカバリ設定を更新しました",
+"Could not update file recovery" => "ファイルリカバリを更新できませんでした"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ka_GE.php b/apps/files_encryption/l10n/ka_GE.php
index bbabd44964..d063463477 100644
--- a/apps/files_encryption/l10n/ka_GE.php
+++ b/apps/files_encryption/l10n/ka_GE.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "შენახვა...",
 "Encryption" => "ენკრიპცია"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index d91e861ca5..41168a340c 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -16,7 +16,6 @@ $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 이상 설치 여부, PHP의 OpenSSL 확장 기능 활성화 및 설정 여부를 확인하십시오. 암호화 앱이 비활성화 되었습니다.",
 "Following users are not set up for encryption:" => "다음 사용자는 암호화를 사용할 수 없습니다:",
 "Initial encryption started... This can take some time. Please wait." => "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.",
-"Saving..." => "저장 중...",
 "Go directly to your " => "다음으로 바로 가기: ",
 "personal settings" => "개인 설정",
 "Encryption" => "암호화",
diff --git a/apps/files_encryption/l10n/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
index d971350b4c..d7b10d1df6 100644
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ b/apps/files_encryption/l10n/ku_IQ.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "پاشکه‌وتده‌کات...",
 "Encryption" => "نهێنیکردن"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 993e03388d..dd8a0d7633 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -9,12 +9,13 @@ $TRANSLATIONS = array(
 "Private key password successfully updated." => "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Failo iššifruoti nepavyko, gali būti jog jis yra pasidalintas su jumis. Paprašykite failo savininko, kad jums iš naujo pateiktų šį failą.",
 "Unknown error please check your system settings or contact your administrator" => "Neatpažinta klaida, patikrinkite sistemos nustatymus arba kreipkitės į savo sistemos aministratorių",
 "Missing requirements." => "Trūkstami laukai.",
 "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." => "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta.",
 "Following users are not set up for encryption:" => "Sekantys naudotojai nenustatyti šifravimui:",
-"Saving..." => "Saugoma...",
+"Initial encryption started... This can take some time. Please wait." => "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.",
 "Go directly to your " => "Eiti tiesiai į Jūsų",
 "personal settings" => "asmeniniai nustatymai",
 "Encryption" => "Šifravimas",
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index b8414174a7..cbf8b7cbda 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "Saglabā...",
 "Encryption" => "Šifrēšana"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
index 098f4d635b..b13d2c28ce 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -3,7 +3,6 @@ $TRANSLATIONS = array(
 "Password successfully changed." => "Лозинката е успешно променета.",
 "Could not change the password. Maybe the old password was not correct." => "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
 "Missing requirements." => "Барања кои недостасуваат.",
-"Saving..." => "Снимам...",
 "Go directly to your " => "Одете директно на вашиот",
 "personal settings" => "лични подесувања",
 "Encryption" => "Енкрипција",
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index 26956c410a..f7484c0e15 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,6 +1,43 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "Lagrer...",
-"Encryption" => "Kryptering"
+"Recovery key successfully enabled" => "Gjenopprettingsnøkkel aktivert",
+"Could not enable recovery key. Please check your recovery key password!" => "Klarte ikke å aktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
+"Recovery key successfully disabled" => "Gjenopprettingsnøkkel ble deaktivert",
+"Could not disable recovery key. Please check your recovery key password!" => "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
+"Password successfully changed." => "Passordet ble endret.",
+"Could not change the password. Maybe the old password was not correct." => "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
+"Private key password successfully updated." => "Passord for privat nøkkel ble oppdatert.",
+"Could not update the private key password. Maybe the old password was not correct." => "Klarte ikke å oppdatere passord for privat nøkkel. Kanskje gammelt passord ikke var korrekt.",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøkkel er ikke gyldig! Sannsynligvis ble passordet ditt endret utenfor %s. (f.eks. din bedriftskatalog). Du kan oppdatere passordet for din private nøkkel i dine personlige innstillinger for å gjenvinne tilgang til de krypterte filene dine.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt.",
+"Unknown error please check your system settings or contact your administrator" => "Ukjent feil. Sjekk systeminnstillingene dine eller kontakt administratoren",
+"Missing requirements." => "Manglende krav.",
+"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." => "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert.",
+"Following users are not set up for encryption:" => "Følgende brukere er ikke satt opp for kryptering:",
+"Initial encryption started... This can take some time. Please wait." => "Første gangs kryptering startet... Dette kan ta litt tid. Vennligst vent.",
+"Go directly to your " => "Gå direkte til din",
+"personal settings" => "personlige innstillinger",
+"Encryption" => "Kryptering",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
+"Recovery key password" => "Passord for gjenopprettingsnøkkel",
+"Repeat Recovery key password" => "Gjenta passord for gjenopprettingsnøkkel",
+"Enabled" => "Aktiv",
+"Disabled" => "Inaktiv",
+"Change recovery key password:" => "Endre passord for gjenopprettingsnøkkel:",
+"Old Recovery key password" => "Gammelt passord for gjenopprettingsnøkkel",
+"New Recovery key password" => "Nytt passord for gjenopprettingsnøkkel",
+"Repeat New Recovery key password" => "Gjenta nytt passord for gjenopprettingsnøkkel",
+"Change Password" => "Endre passord",
+"Your private key password no longer match your log-in password:" => "Ditt passord for privat nøkkel stemmer ikke med påloggingspassordet ditt lenger:",
+"Set your old private key password to your current log-in password." => "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
+"Old log-in password" => "Gammelt påloggingspassord",
+"Current log-in password" => "Nåværende påloggingspassord",
+"Update Private Key Password" => "Oppdater passord for privat nøkkel",
+"Enable password recovery:" => "Aktiver gjenoppretting av passord:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt.",
+"File recovery settings updated" => "Innstillinger for gjenoppretting av filer ble oppdatert",
+"Could not update file recovery" => "Klarte ikke å oppdatere gjenoppretting av filer"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 081e46a785..e878fc6c12 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -16,7 +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." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
 "Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
 "Initial encryption started... This can take some time. Please wait." => "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.",
-"Saving..." => "Opslaan",
+"Initial encryption running... Please try again later." => "Initiële versleuteling bezig... Probeer het later opnieuw.",
 "Go directly to your " => "Ga meteen naar uw",
 "personal settings" => "persoonlijke instellingen",
 "Encryption" => "Versleuteling",
diff --git a/apps/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php
index bb30d69c59..c472655c8b 100644
--- a/apps/files_encryption/l10n/nn_NO.php
+++ b/apps/files_encryption/l10n/nn_NO.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "Lagrar …",
 "Encryption" => "Kryptering"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index b768bd46f8..db2a02cec9 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -16,7 +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." => "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone.",
 "Following users are not set up for encryption:" => "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
 "Initial encryption started... This can take some time. Please wait." => "Rozpoczęto szyfrowanie... To może chwilę potrwać. Proszę czekać.",
-"Saving..." => "Zapisywanie...",
+"Initial encryption running... Please try again later." => "Trwa szyfrowanie początkowe...Spróbuj ponownie.",
 "Go directly to your " => "Przejdź bezpośrednio do",
 "personal settings" => "Ustawienia osobiste",
 "Encryption" => "Szyfrowanie",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 2fce7fd13a..204311658a 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -16,7 +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." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
 "Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:",
 "Initial encryption started... This can take some time. Please wait." => "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.",
-"Saving..." => "Salvando...",
+"Initial encryption running... Please try again later." => "Criptografia inicial em execução ... Por favor, tente novamente mais tarde.",
 "Go directly to your " => "Ir diretamente para o seu",
 "personal settings" => "configurações pessoais.",
 "Encryption" => "Criptografia",
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 77424005c3..d6d3c26036 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -9,7 +9,6 @@ $TRANSLATIONS = array(
 "Could not update the private key password. Maybe the old password was not correct." => "Não foi possível alterar a chave. Possivelmente a password antiga não está correcta.",
 "Missing requirements." => "Faltam alguns requisitos.",
 "Following users are not set up for encryption:" => "Os utilizadores seguintes não estão marcados para cifragem:",
-"Saving..." => "A guardar...",
 "personal settings" => "configurações personalizadas ",
 "Encryption" => "Encriptação",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Active a chave de recuperação (permite recuperar os ficheiros no caso de perda da password):",
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index 3dcdce3241..5aabc49864 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,6 +1,20 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "Se salvează...",
-"Encryption" => "Încriptare"
+"Recovery key successfully enabled" => "Cheia de recupeare a fost activata cu succes",
+"Could not enable recovery key. Please check your recovery key password!" => "Nu s-a putut activa cheia de recuperare. Verifica parola de recuperare!",
+"Recovery key successfully disabled" => "Cheia de recuperare dezactivata cu succes",
+"Could not disable recovery key. Please check your recovery key password!" => "Nu am putut dezactiva cheia de recuperare. Verifica parola de recuperare!",
+"Password successfully changed." => "Parola a fost modificată cu succes.",
+"Could not change the password. Maybe the old password was not correct." => "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.",
+"Private key password successfully updated." => "Cheia privata a fost actualizata cu succes",
+"Could not update the private key password. Maybe the old password was not correct." => "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta.",
+"personal settings" => "setari personale",
+"Encryption" => "Încriptare",
+"Enabled" => "Activat",
+"Disabled" => "Dezactivat",
+"Change Password" => "Schimbă parola",
+"Your private key password no longer match your log-in password:" => "Parola cheii private nu se mai potriveste cu parola ta de logare:",
+"File recovery settings updated" => "Setarile pentru recuperarea fisierelor au fost actualizate",
+"Could not update file recovery" => "Nu am putut actualiza recuperarea de fisiere"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index e9744b3db4..ba98486893 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -16,7 +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 и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено.",
 "Following users are not set up for encryption:" => "Для следующих пользователей шифрование не настроено:",
 "Initial encryption started... This can take some time. Please wait." => "Начато начальное шифрование... Это может занять какое-то время. Пожалуйста, подождите.",
-"Saving..." => "Сохранение...",
+"Initial encryption running... Please try again later." => "Работает первоначальное шифрование... Пожалуйста, повторите попытку позже.",
 "Go directly to your " => "Перейти прямо в",
 "personal settings" => "персональные настройки",
 "Encryption" => "Шифрование",
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
index 5f5330df54..4c7dc957bf 100644
--- a/apps/files_encryption/l10n/si_LK.php
+++ b/apps/files_encryption/l10n/si_LK.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "සුරැකෙමින් පවතී...",
 "Encryption" => "ගුප්ත කේතනය"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 9e2c01eba3..5fcd0a9f06 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -16,7 +16,6 @@ $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." => "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná.",
 "Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
 "Initial encryption started... This can take some time. Please wait." => "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.",
-"Saving..." => "Ukladám...",
 "Go directly to your " => "Choďte priamo do vášho",
 "personal settings" => "osobné nastavenia",
 "Encryption" => "Šifrovanie",
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 60faf34cf8..e581f9323c 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -16,7 +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." => "Preverite, ali je na strežniku nameščen paket PHP 5.3.3 ali novejši, da je omogočen in pravilno nastavljen PHP OpenSSL. Z obstoječimi možnostmi šifriranje ni mogoče.",
 "Following users are not set up for encryption:" => "Navedeni uporabniki še nimajo nastavljenega šifriranja:",
 "Initial encryption started... This can take some time. Please wait." => "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno.",
-"Saving..." => "Poteka shranjevanje ...",
+"Initial encryption running... Please try again later." => "Začetno šifriranje je v teku ... Poskusite kasneje.",
 "Go directly to your " => "Skočite neposredno na",
 "personal settings" => "osebne nastavitve",
 "Encryption" => "Šifriranje",
diff --git a/apps/files_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
index cbf87dcf4d..8a291faed2 100644
--- a/apps/files_encryption/l10n/sr.php
+++ b/apps/files_encryption/l10n/sr.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "Чување у току...",
 "Encryption" => "Шифровање"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 1e509ea08e..90a9bd73a6 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
 "Missing requirements." => "Krav som saknas",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
 "Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:",
-"Saving..." => "Sparar...",
 "Go directly to your " => "Gå direkt till din",
 "personal settings" => "personliga inställningar",
 "Encryption" => "Kryptering",
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
index 9dec6de3ac..327102b5df 100644
--- a/apps/files_encryption/l10n/ta_LK.php
+++ b/apps/files_encryption/l10n/ta_LK.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "சேமிக்கப்படுகிறது...",
 "Encryption" => "மறைக்குறியீடு"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index 7bf3e2765a..cc670e425a 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "กำลังบันทึกข้อมูล...",
 "Encryption" => "การเข้ารหัส"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index b8289ab71f..85e35f5ddd 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -16,7 +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 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğunu ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı",
 "Following users are not set up for encryption:" => "Aşağıdaki kullanıcılar şifreleme için ayarlanmadılar:",
 "Initial encryption started... This can take some time. Please wait." => "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.",
-"Saving..." => "Kaydediliyor...",
+"Initial encryption running... Please try again later." => "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.",
 "Go directly to your " => "Doğrudan şuraya gidin:",
 "personal settings" => "kişisel ayarlar",
 "Encryption" => "Şifreleme",
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
index 25b3f68634..da9144bb93 100644
--- a/apps/files_encryption/l10n/ug.php
+++ b/apps/files_encryption/l10n/ug.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "ساقلاۋاتىدۇ…",
 "Encryption" => "شىفىرلاش"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 5260dd3f2f..e406c09228 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "Зберігаю...",
 "personal settings" => "особисті налаштування",
 "Encryption" => "Шифрування",
 "Change Password" => "Змінити Пароль"
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 18882be63a..c752f0af22 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,11 +1,27 @@
 <?php
 $TRANSLATIONS = array(
+"Recovery key successfully enabled" => "Khóa khôi phục kích hoạt thành công",
+"Could not enable recovery key. Please check your recovery key password!" => "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
+"Recovery key successfully disabled" => "Vô hiệu hóa khóa khôi phục thành công",
+"Could not disable recovery key. Please check your recovery key password!" => "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
 "Password successfully changed." => "Đã đổi mật khẩu.",
 "Could not change the password. Maybe the old password was not correct." => "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đúng.",
-"Saving..." => "Đang lưu...",
+"Private key password successfully updated." => "Cập nhật thành công mật khẩu khóa cá nhân",
+"Could not update the private key password. Maybe the old password was not correct." => "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng",
+"personal settings" => "Thiết lập cá nhân",
 "Encryption" => "Mã hóa",
 "Enabled" => "Bật",
 "Disabled" => "Tắt",
-"Change Password" => "Đổi Mật khẩu"
+"Change Password" => "Đổi Mật khẩu",
+"Your private key password no longer match your log-in password:" => "Mật khẩu khóa cá nhân không còn phù hợp với mật khẩu đăng nhập:",
+"Set your old private key password to your current log-in password." => "Thiết lập mật khẩu khóa cá nhân cũ đến mật khẩu đăng nhập hiện tại.",
+" If you don't remember your old password you can ask your administrator to recover your files." => "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn.",
+"Old log-in password" => "Mật khẩu đăng nhập cũ",
+"Current log-in password" => "Mật khẩu đăng nhập hiện tại",
+"Update Private Key Password" => "Cập nhật mật khẩu khóa cá nhân",
+"Enable password recovery:" => "Kích hoạt khôi phục mật khẩu:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu",
+"File recovery settings updated" => "Đã cập nhật thiết lập khôi phục tập tin ",
+"Could not update file recovery" => "Không thể cập nhật khôi phục tập tin"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index a51856aec9..4d277e9b17 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -8,7 +8,6 @@ $TRANSLATIONS = array(
 "Could not change the password. Maybe the old password was not correct." => "不能修改密码。旧密码可能不正确。",
 "Private key password successfully updated." => "私钥密码成功更新。",
 "Could not update the private key password. Maybe the old password was not correct." => "无法更新私钥密码。可能旧密码不正确。",
-"Saving..." => "保存中",
 "personal settings" => "个人设置",
 "Encryption" => "加密",
 "Enable recovery key (allow to recover users files in case of password loss):" => "启用恢复密钥（允许你在密码丢失后恢复文件）：",
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 8972490ea5..390e6aff8c 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
 "Missing requirements." => "遺失必要條件。",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "請確認已安裝 PHP 5.3.3 或是更新的版本以及 OpenSSL 也一併安裝在 PHP extension 裡面並啟用及設置完成。現在，加密功能是停用的。",
 "Following users are not set up for encryption:" => "以下的使用者無法設定加密:",
-"Saving..." => "儲存中...",
 "Go directly to your " => "直接到您的",
 "personal settings" => "個人設定",
 "Encryption" => "加密",
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index ef3775875f..8cbbe8a45a 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -367,9 +367,14 @@ class Helper {
 		$post = 0;
 		if(count($_POST) > 0) {
 			$post = 1;
-			}
-			header('Location: ' . $location . '?p=' . $post . '&errorCode=' . $errorCode);
-			exit();
+		}
+
+		if(defined('PHPUNIT_RUN') and PHPUNIT_RUN) {
+			throw new \Exception("Encryption error: $errorCode");
+		}
+
+		header('Location: ' . $location . '?p=' . $post . '&errorCode=' . $errorCode);
+		exit();
 	}
 
 	/**
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index a2d42c22c1..6549273c8f 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -128,6 +128,8 @@ class Proxy extends \OC_FileProxy {
 
 					// re-enable proxy - our work is done
 					\OC_FileProxy::$enabled = $proxyStatus;
+				} else {
+					return false;
 				}
 			}
 		}
@@ -340,6 +342,13 @@ class Proxy extends \OC_FileProxy {
 
 		// if path is a folder do nothing
 		if ($view->is_dir($path)) {
+			$proxyState = \OC_FileProxy::$enabled;
+			\OC_FileProxy::$enabled = false;
+			$fileInfo = $view->getFileInfo($path);
+			\OC_FileProxy::$enabled = $proxyState;
+			if (isset($fileInfo['unencrypted_size']) && $fileInfo['unencrypted_size'] > 0) {
+				return $fileInfo['unencrypted_size'];
+			}
 			return $size;
 		}
 
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 6bf69cd8ee..3db5a42347 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -135,7 +135,6 @@ class Util {
 		// Set directories to check / create
 		$setUpDirs = array(
 			$this->userDir,
-			$this->userFilesDir,
 			$this->publicKeyDir,
 			$this->encryptionDir,
 			$this->keyfilesPath,
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 51cc0b795e..647ee955eb 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -112,4 +112,24 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
 
 	}
 
+	function testPostFileSizeWithDirectory() {
+
+		$this->view->file_put_contents($this->filename, $this->data);
+
+		\OC_FileProxy::$enabled = false;
+
+		// get root size, must match the file's unencrypted size
+		$unencryptedSize = $this->view->filesize('');
+
+		\OC_FileProxy::$enabled = true;
+
+		$encryptedSize = $this->view->filesize('');
+
+		$this->assertTrue($encryptedSize !== $unencryptedSize);
+
+		// cleanup
+		$this->view->unlink($this->filename);
+
+	}
+
 }
diff --git a/apps/files_external/3rdparty/smb4php/smb.php b/apps/files_external/3rdparty/smb4php/smb.php
index 622942b052..e325506fa1 100644
--- a/apps/files_external/3rdparty/smb4php/smb.php
+++ b/apps/files_external/3rdparty/smb4php/smb.php
@@ -8,6 +8,8 @@
 # Homepage: http://www.phpclasses.org/smb4php
 #
 # Copyright (c) 2007 Victor M. Varela <vmvarela@gmail.com>
+# Copyright (c) 2012 Frank Karlitschek <frank@owncloud.org>
+# Copyright (c) 2014 Robin McCorkell <rmccorkell@karoshi.org.uk>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -19,7 +21,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-# Addition 17/12/2012 Frank Karlitschek (frank@owncloud.org)
 # 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
@@ -43,6 +44,42 @@ $GLOBALS['__smb_cache'] = array ('stat' => array (), 'dir' => array ());
 
 class smb {
 
+	private static $regexp = array (
+		'^added interface ip=(.*) bcast=(.*) nmask=(.*)$' => 'skip',
+		'Anonymous login successful' => 'skip',
+		'^Domain=\[(.*)\] OS=\[(.*)\] Server=\[(.*)\]$' => 'skip',
+		'^\tSharename[ ]+Type[ ]+Comment$' => 'shares',
+		'^\t---------[ ]+----[ ]+-------$' => 'skip',
+		'^\tServer   [ ]+Comment$' => 'servers',
+		'^\t---------[ ]+-------$' => 'skip',
+		'^\tWorkgroup[ ]+Master$' => 'workg',
+		'^\t(.*)[ ]+(Disk|IPC)[ ]+IPC.*$' => 'skip',
+		'^\tIPC\\\$(.*)[ ]+IPC' => 'skip',
+		'^\t(.*)[ ]+(Disk)[ ]+(.*)$' => 'share',
+		'^\t(.*)[ ]+(Printer)[ ]+(.*)$' => 'skip',
+		'([0-9]+) blocks of size ([0-9]+)\. ([0-9]+) blocks available' => 'skip',
+		'Got a positive name query response from ' => 'skip',
+		'^(session setup failed): (.*)$' => 'error',
+		'^(.*): ERRSRV - ERRbadpw' => 'error',
+		'^Error returning browse list: (.*)$' => 'error',
+		'^tree connect failed: (.*)$' => 'error',
+		'^(Connection to .* failed)(.*)$' => 'error-connect',
+		'^NT_STATUS_(.*) ' => 'error',
+		'^NT_STATUS_(.*)\$' => 'error',
+		'ERRDOS - ERRbadpath \((.*).\)' => 'error',
+		'cd (.*): (.*)$' => 'error',
+		'^cd (.*): NT_STATUS_(.*)' => 'error',
+		'^\t(.*)$' => 'srvorwg',
+		'^([0-9]+)[ ]+([0-9]+)[ ]+(.*)$' => 'skip',
+		'^Job ([0-9]+) cancelled' => 'skip',
+		'^[ ]+(.*)[ ]+([0-9]+)[ ]+(Mon|Tue|Wed|Thu|Fri|Sat|Sun)[ ](Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[ ]+([0-9]+)[ ]+([0-9]{2}:[0-9]{2}:[0-9]{2})[ ]([0-9]{4})$' => 'files',
+		'^message start: ERRSRV - (ERRmsgoff)' => 'error'
+	);
+
+	function getRegexp() {
+		return self::$regexp;
+	}
+
 	function parse_url ($url) {
 		$pu = parse_url (trim($url));
 		foreach (array ('domain', 'user', 'pass', 'host', 'port', 'path') as $i) {
@@ -74,46 +111,16 @@ class smb {
 	}
 
 
-	function execute ($command, $purl) {
+	function execute ($command, $purl, $regexp = NULL) {
 		return smb::client ('-d 0 '
 				. escapeshellarg ('//' . $purl['host'] . '/' . $purl['share'])
-				. ' -c ' . escapeshellarg ($command), $purl
+				. ' -c ' . escapeshellarg ($command), $purl, $regexp
 		);
 	}
 
-	function client ($params, $purl) {
+	function client ($params, $purl, $regexp = NULL) {
 
-		static $regexp = array (
-			'^added interface ip=(.*) bcast=(.*) nmask=(.*)$' => 'skip',
-			'Anonymous login successful' => 'skip',
-			'^Domain=\[(.*)\] OS=\[(.*)\] Server=\[(.*)\]$' => 'skip',
-			'^\tSharename[ ]+Type[ ]+Comment$' => 'shares',
-			'^\t---------[ ]+----[ ]+-------$' => 'skip',
-			'^\tServer   [ ]+Comment$' => 'servers',
-			'^\t---------[ ]+-------$' => 'skip',
-			'^\tWorkgroup[ ]+Master$' => 'workg',
-			'^\t(.*)[ ]+(Disk|IPC)[ ]+IPC.*$' => 'skip',
-			'^\tIPC\\\$(.*)[ ]+IPC' => 'skip',
-			'^\t(.*)[ ]+(Disk)[ ]+(.*)$' => 'share',
-			'^\t(.*)[ ]+(Printer)[ ]+(.*)$' => 'skip',
-			'([0-9]+) blocks of size ([0-9]+)\. ([0-9]+) blocks available' => 'skip',
-			'Got a positive name query response from ' => 'skip',
-			'^(session setup failed): (.*)$' => 'error',
-			'^(.*): ERRSRV - ERRbadpw' => 'error',
-			'^Error returning browse list: (.*)$' => 'error',
-			'^tree connect failed: (.*)$' => 'error',
-			'^(Connection to .* failed)(.*)$' => 'error-connect',
-			'^NT_STATUS_(.*) ' => 'error',
-			'^NT_STATUS_(.*)\$' => 'error',
-			'ERRDOS - ERRbadpath \((.*).\)' => 'error',
-			'cd (.*): (.*)$' => 'error',
-			'^cd (.*): NT_STATUS_(.*)' => 'error',
-			'^\t(.*)$' => 'srvorwg',
-			'^([0-9]+)[ ]+([0-9]+)[ ]+(.*)$' => 'skip',
-			'^Job ([0-9]+) cancelled' => 'skip',
-			'^[ ]+(.*)[ ]+([0-9]+)[ ]+(Mon|Tue|Wed|Thu|Fri|Sat|Sun)[ ](Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)[ ]+([0-9]+)[ ]+([0-9]{2}:[0-9]{2}:[0-9]{2})[ ]([0-9]{4})$' => 'files',
-			'^message start: ERRSRV - (ERRmsgoff)' => 'error'
-		);
+		if ($regexp === NULL) $regexp = smb::$regexp;
 
 		if (SMB4PHP_AUTHMODE == 'env') {
 			putenv("USER={$purl['user']}%{$purl['pass']}");
@@ -238,17 +245,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/appinfo/app.php b/apps/files_external/appinfo/app.php
index 5b1cd86a17..aeb7a2cb23 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+ * Copyright (c) 2014 Robin McCorkell <rmccorkell@karoshi.org.uk>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -13,6 +14,7 @@ OC::$CLASSPATH['OC\Files\Storage\OwnCloud'] = 'files_external/lib/owncloud.php';
 OC::$CLASSPATH['OC\Files\Storage\Google'] = 'files_external/lib/google.php';
 OC::$CLASSPATH['OC\Files\Storage\Swift'] = 'files_external/lib/swift.php';
 OC::$CLASSPATH['OC\Files\Storage\SMB'] = 'files_external/lib/smb.php';
+OC::$CLASSPATH['OC\Files\Storage\SMB_OC'] = 'files_external/lib/smb_oc.php';
 OC::$CLASSPATH['OC\Files\Storage\AmazonS3'] = 'files_external/lib/amazons3.php';
 OC::$CLASSPATH['OC\Files\Storage\Dropbox'] = 'files_external/lib/dropbox.php';
 OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php';
@@ -25,5 +27,7 @@ if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == '
 }
 
 // connecting hooks
-OCP\Util::connectHook( 'OC_User', 'post_login', 'OC\Files\Storage\iRODS', 'login' );
+OCP\Util::connectHook('OC_Filesystem', 'post_initMountPoints', '\OC_Mount_Config', 'initMountPointsHook');
+OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\iRODS', 'login');
+OCP\Util::connectHook('OC_User', 'post_login', 'OC\Files\Storage\SMB_OC', 'login');
 
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 11aeb10184..1d3489f7f5 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -4,13 +4,6 @@ td.status > span {
 	width: 16px;
 	vertical-align: text-bottom;
 }
-span.success {
-	background: #37ce02;
-	border-radius: 8px;
-}
-span.error {
-	background: #ce3702;
-}
 
 td.mountPoint, td.backend { width:160px; }
 td.remove>img { visibility:hidden; padding-top:13px; }
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 895f97bd2c..00793a614c 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -181,16 +181,21 @@ $(document).ready(function() {
 		$.each(configurations, function(backend, parameters) {
 			if (backend == backendClass) {
 				$.each(parameters['configuration'], function(parameter, placeholder) {
-					if (placeholder.indexOf('*') != -1) {
-						td.append('<input type="password" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
-					} else if (placeholder.indexOf('!') != -1) {
+					var is_optional = false;
+					if (placeholder.indexOf('&') === 0) {
+						is_optional = true;
+						placeholder = placeholder.substring(1);
+					}
+					if (placeholder.indexOf('*') === 0) {
+						var class_string = is_optional ? ' class="optional"' : '';
+						td.append('<input type="password"' + class_string + ' data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
+					} else if (placeholder.indexOf('!') === 0) {
 						td.append('<label><input type="checkbox" data-parameter="'+parameter+'" />'+placeholder.substring(1)+'</label>');
-					} else if (placeholder.indexOf('&') != -1) {
-						td.append('<input type="text" class="optional" data-parameter="'+parameter+'" placeholder="'+placeholder.substring(1)+'" />');
-					} else if (placeholder.indexOf('#') != -1) {
+					} else if (placeholder.indexOf('#') === 0) {
 						td.append('<input type="hidden" data-parameter="'+parameter+'" />');
 					} else {
-						td.append('<input type="text" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />');
+						var class_string = is_optional ? ' class="optional"' : '';
+						td.append('<input type="text"' + class_string + ' data-parameter="'+parameter+'" placeholder="'+placeholder+'" />');
 					}
 				});
 				if (parameters['custom'] && $('#externalStorage tbody tr.'+backendClass.replace(/\\/g, '\\\\')).length == 1) {
@@ -264,7 +269,7 @@ $(document).ready(function() {
 		OC.MountConfig.saveStorage($(this).parent().parent());
 	});
 
-    $('#sslCertificate').on('click', 'td.remove>img', function() {
+	$('#sslCertificate').on('click', 'td.remove>img', function() {
 		var $tr = $(this).parent().parent();
 		var row = this.parentNode.parentNode;
 		$.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: row.id});
@@ -302,13 +307,23 @@ $(document).ready(function() {
 	});
 
 	$('#allowUserMounting').bind('change', function() {
+		OC.msg.startSaving('#userMountingMsg');
 		if (this.checked) {
 			OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'yes');
+			$('#userMountingBackups').removeClass('hidden');
 		} else {
 			OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'no');
+			$('#userMountingBackups').addClass('hidden');
 		}
+		OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('settings', 'Saved')}});
 	});
 
+	$('input[name="allowUserMountingBackends\\[\\]"]').bind('change', function() {
+		OC.msg.startSaving('#userMountingMsg');
+		var user_mounting_backends = $('input[name="allowUserMountingBackends\\[\\]"]:checked').map(function(){return $(this).val();}).get();
+		OC.AppConfig.setValue('files_external', 'user_mounting_backends', user_mounting_backends.join());
+		OC.msg.finishedSaving('#userMountingMsg', {status: 'success', data: {message: t('settings', 'Saved')}});
+	});
 });
 
 })();
diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
index 338526d2af..5fd4e4c398 100644
--- a/apps/files_external/l10n/ar.php
+++ b/apps/files_external/l10n/ar.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "حفظ",
 "Folder name" => "اسم المجلد",
 "Options" => "خيارات",
 "All Users" => "كل المستخدمين",
diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php
index 17665d2228..d59a4b8c80 100644
--- a/apps/files_external/l10n/bg_BG.php
+++ b/apps/files_external/l10n/bg_BG.php
@@ -13,7 +13,6 @@ $TRANSLATIONS = array(
 "Users" => "Потребители",
 "Delete" => "Изтриване",
 "Enable User External Storage" => "Вкл. на поддръжка за външно потр. хранилище",
-"Allow users to mount their own external storage" => "Позволено е на потребителите да ползват тяхно лично външно хранилище",
 "SSL root certificates" => "SSL основни сертификати",
 "Import Root Certificate" => "Импортиране на основен сертификат"
 );
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
index 0591dbba55..065d61acfc 100644
--- a/apps/files_external/l10n/bn_BD.php
+++ b/apps/files_external/l10n/bn_BD.php
@@ -15,7 +15,6 @@ $TRANSLATIONS = array(
 "Users" => "ব্যবহারকারী",
 "Delete" => "মুছে",
 "Enable User External Storage" => "ব্যবহারকারীর বাহ্যিক সংরক্ষণাগার সক্রিয় কর",
-"Allow users to mount their own external storage" => "ব্যবহারকারীদেরকে তাদের নিজস্ব বাহ্যিক সংরক্ষনাগার  সাউন্ট করতে অনুমোদন দাও",
 "SSL root certificates" => "SSL  রুট সনদপত্র",
 "Import Root Certificate" => "রুট সনদপত্রটি আমদানি করুন"
 );
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index c1d6ec077b..3e72204629 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,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Usuaris",
 "Delete" => "Esborra",
 "Enable User External Storage" => "Habilita l'emmagatzemament extern d'usuari",
-"Allow users to mount their own external storage" => "Permet als usuaris muntar el seu emmagatzemament extern propi",
+"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 a574e0506c..1b92e35c45 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,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Uživatelé",
 "Delete" => "Smazat",
 "Enable User External Storage" => "Zapnout externí uživatelské úložiště",
-"Allow users to mount their own external storage" => "Povolit uživatelům připojení jejich vlastních externích úložišť",
+"Allow users to mount the following external storage" => "Povolit uživatelů připojit následující 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/l10n/da.php b/apps/files_external/l10n/da.php
index 3a25142b36..f3ac35e42e 100644
--- a/apps/files_external/l10n/da.php
+++ b/apps/files_external/l10n/da.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Godkend adgang",
 "Please provide a valid Dropbox app key and secret." => "Angiv venligst en valid Dropbox app nøgle og hemmelighed",
 "Error configuring Google Drive storage" => "Fejl ved konfiguration af Google Drive plads",
+"Saved" => "Gemt",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det.",
 "<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> Advarsel: </ b> FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det.",
 "<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>Advarsel:</b> Understøttelsen for Curl i PHP er enten ikke aktiveret eller ikke installeret. Det er ikke muligt, at montere ownCloud / WebDAV eller GoogleDrive. Spørg din system administrator om at installere det. ",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Brugere",
 "Delete" => "Slet",
 "Enable User External Storage" => "Aktiver ekstern opbevaring for brugere",
-"Allow users to mount their own external storage" => "Tillad brugere at montere deres egne eksterne opbevaring",
+"Allow users to mount the following external storage" => "Tillad brugere at montere følgende som eksternt lager",
 "SSL root certificates" => "SSL-rodcertifikater",
 "Import Root Certificate" => "Importer rodcertifikat"
 );
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
index b2c72f7688..a78728b4c2 100644
--- a/apps/files_external/l10n/de.php
+++ b/apps/files_external/l10n/de.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Zugriff gestatten",
 "Please provide a valid Dropbox app key and secret." => "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
 "Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
+"Saved" => "Gespeichert",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren.",
 "<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>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator.",
 "<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>Warnung:</b> Die Curl-Unterstützung in PHP ist nicht aktiviert oder installiert. Das Einbinden von ownCloud / WebDav der GoogleDrive-Freigaben ist nicht möglich. Bitte Deinen Systemadminstrator um die Installation. ",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Benutzer",
 "Delete" => "Löschen",
 "Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
-"Allow users to mount their own external storage" => "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden",
+"Allow users to mount the following external storage" => "Erlaube es Benutzern, den folgenden externen Speicher einzubinden",
 "SSL root certificates" => "SSL-Root-Zertifikate",
 "Import Root Certificate" => "Root-Zertifikate importieren"
 );
diff --git a/apps/files_external/l10n/de_AT.php b/apps/files_external/l10n/de_AT.php
new file mode 100644
index 0000000000..afa3eff001
--- /dev/null
+++ b/apps/files_external/l10n/de_AT.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Delete" => "Löschen"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de_CH.php b/apps/files_external/l10n/de_CH.php
index 85e2f2d91f..8a13c7cdd5 100644
--- a/apps/files_external/l10n/de_CH.php
+++ b/apps/files_external/l10n/de_CH.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Benutzer",
 "Delete" => "Löschen",
 "Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
-"Allow users to mount their own external storage" => "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden",
 "SSL root certificates" => "SSL-Root-Zertifikate",
 "Import Root Certificate" => "Root-Zertifikate importieren"
 );
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
index 8f6a25cb52..5ffe946c69 100644
--- a/apps/files_external/l10n/de_DE.php
+++ b/apps/files_external/l10n/de_DE.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Zugriff gestatten",
 "Please provide a valid Dropbox app key and secret." => "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
 "Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
+"Saved" => "Gespeichert",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren.",
 "<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>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator.",
 "<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>Achtung:</b> Die Curl-Unterstützung  von PHP ist nicht aktiviert oder installiert. Das Laden von ownCloud / WebDAV oder GoogleDrive Freigaben ist nicht möglich. Bitte Sie Ihren Systemadministrator, das Modul zu installieren.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Benutzer",
 "Delete" => "Löschen",
 "Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
-"Allow users to mount their own external storage" => "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden",
+"Allow users to mount the following external storage" => "Erlauben Sie Benutzern, folgende externe Speicher einzubinden",
 "SSL root certificates" => "SSL-Root-Zertifikate",
 "Import Root Certificate" => "Root-Zertifikate importieren"
 );
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index 0161c0901d..4dcd93d7ac 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Παροχή πρόσβασης",
 "Please provide a valid Dropbox app key and secret." => "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
 "Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
+"Saved" => "Αποθηκεύτηκαν",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση CIFS/SMB. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Η υποστήριξη FTP στην PHP δεν ενεργοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση FTP. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει.",
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<Προειδοποίηση </b> Η υποστήριξη του συστήματος Curl στο PHP δεν είναι ενεργοποιημένη ή εγκαταστημένη. Η αναπαραγωγή του ownCloud/WebDAV ή GoogleDrive δεν είναι δυνατή. Παρακαλώ ρωτήστε τον διαχειριστλη του συστήματος για την εγκατάσταση. ",
@@ -21,7 +22,6 @@ $TRANSLATIONS = array(
 "Users" => "Χρήστες",
 "Delete" => "Διαγραφή",
 "Enable User External Storage" => "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη",
-"Allow users to mount their own external storage" => "Να επιτρέπεται στους χρήστες να προσαρτούν δικό τους εξωτερικό αποθηκευτικό χώρο",
 "SSL root certificates" => "Πιστοποιητικά SSL root",
 "Import Root Certificate" => "Εισαγωγή Πιστοποιητικού Root"
 );
diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php
index 8adca794dd..f7fdbf2f0d 100644
--- a/apps/files_external/l10n/en_GB.php
+++ b/apps/files_external/l10n/en_GB.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Grant access",
 "Please provide a valid Dropbox app key and secret." => "Please provide a valid Dropbox app key and secret.",
 "Error configuring Google Drive storage" => "Error configuring Google Drive storage",
+"Saved" => "Saved",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.",
 "<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>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>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>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.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Users",
 "Delete" => "Delete",
 "Enable User External Storage" => "Enable User External Storage",
-"Allow users to mount their own external storage" => "Allow users to mount their own external storage",
+"Allow users to mount the following external storage" => "Allow users to mount the following external storage",
 "SSL root certificates" => "SSL root certificates",
 "Import Root Certificate" => "Import Root Certificate"
 );
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index 5697221cac..aba16e2efa 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -16,7 +16,6 @@ $TRANSLATIONS = array(
 "Users" => "Uzantoj",
 "Delete" => "Forigi",
 "Enable User External Storage" => "Kapabligi malenan memorilon de uzanto",
-"Allow users to mount their own external storage" => "Permesi al uzantoj surmeti siajn proprajn malenajn memorilojn",
 "SSL root certificates" => "Radikaj SSL-atestoj",
 "Import Root Certificate" => "Enporti radikan ateston"
 );
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index 5179d9329a..ea831c947f 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Conceder acceso",
 "Please provide a valid Dropbox app key and secret." => "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
 "Error configuring Google Drive storage" => "Error configurando el almacenamiento de Google Drive",
+"Saved" => "Guardado",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale.",
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de Curl en PHP no está activado ni instalado. El montado de ownCloud, WebDAV o GoogleDrive no es posible. Pida al administrador de su sistema que lo instale.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Usuarios",
 "Delete" => "Eliminar",
 "Enable User External Storage" => "Habilitar almacenamiento externo de usuario",
-"Allow users to mount their own external storage" => "Permitir a los usuarios montar su propio almacenamiento externo",
+"Allow users to mount the following external storage" => "Permitir a los usuarios montar el siguiente almacenamiento externo",
 "SSL root certificates" => "Certificados raíz SSL",
 "Import Root Certificate" => "Importar certificado raíz"
 );
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
index a0bb3a8dfe..05204b748c 100644
--- a/apps/files_external/l10n/es_AR.php
+++ b/apps/files_external/l10n/es_AR.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Usuarios",
 "Delete" => "Borrar",
 "Enable User External Storage" => "Habilitar almacenamiento de usuario externo",
-"Allow users to mount their own external storage" => "Permitir a los usuarios montar su propio almacenamiento externo",
 "SSL root certificates" => "certificados SSL raíz",
 "Import Root Certificate" => "Importar certificado raíz"
 );
diff --git a/apps/files_external/l10n/es_MX.php b/apps/files_external/l10n/es_MX.php
index b508df8476..5d3fd44bec 100644
--- a/apps/files_external/l10n/es_MX.php
+++ b/apps/files_external/l10n/es_MX.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Usuarios",
 "Delete" => "Eliminar",
 "Enable User External Storage" => "Habilitar almacenamiento externo de usuario",
-"Allow users to mount their own external storage" => "Permitir a los usuarios montar su propio almacenamiento externo",
 "SSL root certificates" => "Certificados raíz SSL",
 "Import Root Certificate" => "Importar certificado raíz"
 );
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index a7e623eb7d..c6450f95e1 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Kasutajad",
 "Delete" => "Kustuta",
 "Enable User External Storage" => "Luba kasutajatele väline salvestamine",
-"Allow users to mount their own external storage" => "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed",
 "SSL root certificates" => "SSL root sertifikaadid",
 "Import Root Certificate" => "Impordi root sertifikaadid"
 );
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index db92e2f001..bdc5cf5676 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Erabiltzaileak",
 "Delete" => "Ezabatu",
 "Enable User External Storage" => "Gaitu erabiltzaileentzako Kanpo Biltegiratzea",
-"Allow users to mount their own external storage" => "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen",
 "SSL root certificates" => "SSL erro ziurtagiriak",
 "Import Root Certificate" => "Inportatu Erro Ziurtagiria"
 );
diff --git a/apps/files_external/l10n/eu_ES.php b/apps/files_external/l10n/eu_ES.php
new file mode 100644
index 0000000000..8612c8609b
--- /dev/null
+++ b/apps/files_external/l10n/eu_ES.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Delete" => "Ezabatu"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
index 216893811c..544b8a14d5 100644
--- a/apps/files_external/l10n/fa.php
+++ b/apps/files_external/l10n/fa.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "کاربران",
 "Delete" => "حذف",
 "Enable User External Storage" => "فعال سازی حافظه خارجی کاربر",
-"Allow users to mount their own external storage" => "اجازه به کاربران برای متصل کردن منابع ذخیره ی خارجی خودشان",
 "SSL root certificates" => "گواهی های اصلی SSL ",
 "Import Root Certificate" => "وارد کردن گواهی اصلی"
 );
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index 9632aa255e..d2f9d1a73a 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Salli pääsy",
 "Please provide a valid Dropbox app key and secret." => "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus.",
 "Error configuring Google Drive storage" => "Virhe Google Drive levyn asetuksia tehtäessä",
+"Saved" => "Tallennettu",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Varoitus:</b> \"smbclient\" ei ole asennettuna. CIFS-/SMB-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan smbclient.",
 "<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>Varoitus:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. FTP-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
 "<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>Varoitus:</b> PHP:n Curl-tuki ei ole käytössä tai sitä ei ole lainkaan asennettu. ownCloudin, WebDAV:in tai Google Driven liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan Curl-tuki käyttöön.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Käyttäjät",
 "Delete" => "Poista",
 "Enable User External Storage" => "Ota käyttöön ulkopuoliset tallennuspaikat",
-"Allow users to mount their own external storage" => "Salli käyttäjien liittää omia erillisiä tallennusvälineitä",
+"Allow users to mount the following external storage" => "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet",
 "SSL root certificates" => "SSL-juurivarmenteet",
 "Import Root Certificate" => "Tuo juurivarmenne"
 );
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index f6b1a75200..4b8e2b905b 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Autoriser l'accès",
 "Please provide a valid Dropbox app key and secret." => "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
 "Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage Google Drive",
+"Saved" => "Sauvegarder",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer.",
 "<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>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer.",
 "<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>Attention :</b> Le support de Curl n'est pas activé ou installé dans PHP. Le montage de ownCloud / WebDAV ou GoogleDrive n'est pas possible. Contactez votre administrateur système pour l'installer.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Utilisateurs",
 "Delete" => "Supprimer",
 "Enable User External Storage" => "Activer le stockage externe pour les utilisateurs",
-"Allow users to mount their own external storage" => "Autoriser les utilisateurs à monter leur propre stockage externe",
+"Allow users to mount the following external storage" => "Autorise les utilisateurs à monter les stockage externes suivants",
 "SSL root certificates" => "Certificats racine SSL",
 "Import Root Certificate" => "Importer un certificat racine"
 );
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
index 3dda999dd1..ec13fe241f 100644
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Permitir o acceso",
 "Please provide a valid Dropbox app key and secret." => "Forneza unha chave correcta e segreda do Dropbox.",
 "Error configuring Google Drive storage" => "Produciuse un erro ao configurar o almacenamento en Google Drive",
+"Saved" => "Gardado",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> «smbclient» non está instalado. Non é posibel a montaxe de comparticións CIFS/SMB. Consulte co administrador do sistema para instalalo.",
 "<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>Aviso:</b> A compatibilidade de FTP en PHP non está activada ou instalada. Non é posibel a montaxe de comparticións FTP. Consulte co administrador do sistema para instalalo.",
 "<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>Aviso:</ b> A compatibilidade de Curl en PHP non está activada ou instalada. Non é posíbel a montaxe de ownCloud / WebDAV ou GoogleDrive. Consulte co administrador do sistema para instalala.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Usuarios",
 "Delete" => "Eliminar",
 "Enable User External Storage" => "Activar o almacenamento externo do usuario",
-"Allow users to mount their own external storage" => "Permitir aos usuarios montar os seus propios almacenamentos externos",
+"Allow users to mount the following external storage" => "Permitirlle aos usuarios montar o seguinte almacenamento externo",
 "SSL root certificates" => "Certificados SSL root",
 "Import Root Certificate" => "Importar o certificado root"
 );
diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php
index e99c9f5193..6aec07e78c 100644
--- a/apps/files_external/l10n/he.php
+++ b/apps/files_external/l10n/he.php
@@ -16,7 +16,6 @@ $TRANSLATIONS = array(
 "Users" => "משתמשים",
 "Delete" => "מחיקה",
 "Enable User External Storage" => "הפעלת אחסון חיצוני למשתמשים",
-"Allow users to mount their own external storage" => "יאפשר למשתמשים לעגן את האחסון החיצוני שלהם",
 "SSL root certificates" => "שורש אישורי אבטחת SSL ",
 "Import Root Certificate" => "ייבוא אישור אבטחת שורש"
 );
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
index 23fe916eba..6066138043 100644
--- a/apps/files_external/l10n/hu_HU.php
+++ b/apps/files_external/l10n/hu_HU.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Felhasználók",
 "Delete" => "Törlés",
 "Enable User External Storage" => "Külső tárolók engedélyezése a felhasználók részére",
-"Allow users to mount their own external storage" => "Lehetővé teszi, hogy a felhasználók külső tárolási szolgáltatásokat csatoljanak be a saját területükre",
 "SSL root certificates" => "SSL tanúsítványok",
 "Import Root Certificate" => "SSL tanúsítványok importálása"
 );
diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php
index 53ab79ae7e..9f91fdf992 100644
--- a/apps/files_external/l10n/id.php
+++ b/apps/files_external/l10n/id.php
@@ -20,7 +20,6 @@ $TRANSLATIONS = array(
 "Users" => "Pengguna",
 "Delete" => "Hapus",
 "Enable User External Storage" => "Aktifkan Penyimpanan Eksternal Pengguna",
-"Allow users to mount their own external storage" => "Izinkan pengguna untuk mengaitkan penyimpanan eksternal mereka",
 "SSL root certificates" => "Sertifikat root SSL",
 "Import Root Certificate" => "Impor Sertifikat Root"
 );
diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php
index d2229d1fcd..e86cfa108a 100644
--- a/apps/files_external/l10n/is.php
+++ b/apps/files_external/l10n/is.php
@@ -18,7 +18,6 @@ $TRANSLATIONS = array(
 "Users" => "Notendur",
 "Delete" => "Eyða",
 "Enable User External Storage" => "Virkja ytra gagnasvæði notenda",
-"Allow users to mount their own external storage" => "Leyfa notendum að bæta við sínum eigin ytri gagnasvæðum",
 "SSL root certificates" => "SSL rótar skilríki",
 "Import Root Certificate" => "Flytja inn rótar skilríki"
 );
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index b53663beb5..d62d8e9732 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Concedi l'accesso",
 "Please provide a valid Dropbox app key and secret." => "Fornisci chiave di applicazione e segreto di Dropbox validi.",
 "Error configuring Google Drive storage" => "Errore durante la configurazione dell'archivio Google Drive",
+"Saved" => "Salvato",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Avviso:</b> \"smbclient\" non è installato. Impossibile montare condivisioni CIFS/SMB. Chiedi all'amministratore di sistema di installarlo.",
 "<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>Avviso:</b> il supporto FTP di PHP non è abilitato o non è installato. Impossibile montare condivisioni FTP. Chiedi all'amministratore di sistema di installarlo.",
 "<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>Avviso:</b> il supporto Curl di PHP non è abilitato o non è installato. Impossibile montare condivisioni ownCloud / WebDAV o GoogleDrive. Chiedi all'amministratore di sistema di installarlo.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Utenti",
 "Delete" => "Elimina",
 "Enable User External Storage" => "Abilita la memoria esterna dell'utente",
-"Allow users to mount their own external storage" => "Consenti agli utenti di montare la propria memoria esterna",
+"Allow users to mount the following external storage" => "Consenti agli utenti di montare la seguente memoria esterna",
 "SSL root certificates" => "Certificati SSL radice",
 "Import Root Certificate" => "Importa certificato radice"
 );
diff --git a/apps/files_external/l10n/ja.php b/apps/files_external/l10n/ja.php
new file mode 100644
index 0000000000..312dc85188
--- /dev/null
+++ b/apps/files_external/l10n/ja.php
@@ -0,0 +1,29 @@
+<?php
+$TRANSLATIONS = array(
+"Access granted" => "アクセスは許可されました",
+"Error configuring Dropbox storage" => "Dropboxストレージの設定エラー",
+"Grant access" => "アクセスを許可",
+"Please provide a valid Dropbox app key and secret." => "有効なDropboxアプリのキーとパスワードを入力してください。",
+"Error configuring Google Drive storage" => "Googleドライブストレージの設定エラー",
+"Saved" => "保存されました",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>警告:</b> \"smbclient\" がインストールされていません。CIFS/SMB共有のマウントはできません。システム管理者にインストールを依頼してください。",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>警告:</b> PHPのFTPサポートが無効またはインストールされていません。FTP共有のマウントはできません。システム管理者にインストールを依頼してください。",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>警告:</b> PHPのCurlサポートが無効またはインストールされていません。ownCloud / WebDAVまたはGoogleDriveのマウントはできません。システム管理者にインストールを依頼してください。",
+"External Storage" => "外部ストレージ",
+"Folder name" => "フォルダー名",
+"External storage" => "外部ストレージ",
+"Configuration" => "設定",
+"Options" => "オプション",
+"Applicable" => "適用範囲",
+"Add storage" => "ストレージを追加",
+"None set" => "未設定",
+"All Users" => "すべてのユーザー",
+"Groups" => "グループ",
+"Users" => "ユーザー",
+"Delete" => "削除",
+"Enable User External Storage" => "ユーザーの外部ストレージを有効にする",
+"Allow users to mount the following external storage" => "ユーザに以下の外部ストレージのマウントを許可する",
+"SSL root certificates" => "SSLルート証明書",
+"Import Root Certificate" => "ルート証明書をインポート"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ja_JP.php b/apps/files_external/l10n/ja_JP.php
index fc528f035c..312dc85188 100644
--- a/apps/files_external/l10n/ja_JP.php
+++ b/apps/files_external/l10n/ja_JP.php
@@ -3,25 +3,26 @@ $TRANSLATIONS = array(
 "Access granted" => "アクセスは許可されました",
 "Error configuring Dropbox storage" => "Dropboxストレージの設定エラー",
 "Grant access" => "アクセスを許可",
-"Please provide a valid Dropbox app key and secret." => "有効なDropboxアプリのキーとパスワードを入力して下さい。",
+"Please provide a valid Dropbox app key and secret." => "有効なDropboxアプリのキーとパスワードを入力してください。",
 "Error configuring Google Drive storage" => "Googleドライブストレージの設定エラー",
-"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>警告:</b> \"smbclient\" はインストールされていません。CIFS/SMB 共有のマウントはできません。システム管理者にインストールをお願いして下さい。",
-"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>警告:</b> PHPのFTPサポートは無効もしくはインストールされていません。FTP共有のマウントはできません。システム管理者にインストールをお願いして下さい。",
-"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>警告:</b> PHP の Curl サポートは無効もしくはインストールされていません。ownCloud / WebDAV もしくは GoogleDrive のマウントはできません。システム管理者にインストールをお願いして下さい。",
+"Saved" => "保存されました",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>警告:</b> \"smbclient\" がインストールされていません。CIFS/SMB共有のマウントはできません。システム管理者にインストールを依頼してください。",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>警告:</b> PHPのFTPサポートが無効またはインストールされていません。FTP共有のマウントはできません。システム管理者にインストールを依頼してください。",
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>警告:</b> PHPのCurlサポートが無効またはインストールされていません。ownCloud / WebDAVまたはGoogleDriveのマウントはできません。システム管理者にインストールを依頼してください。",
 "External Storage" => "外部ストレージ",
-"Folder name" => "フォルダ名",
+"Folder name" => "フォルダー名",
 "External storage" => "外部ストレージ",
 "Configuration" => "設定",
 "Options" => "オプション",
 "Applicable" => "適用範囲",
 "Add storage" => "ストレージを追加",
 "None set" => "未設定",
-"All Users" => "すべてのユーザ",
+"All Users" => "すべてのユーザー",
 "Groups" => "グループ",
-"Users" => "ユーザ",
+"Users" => "ユーザー",
 "Delete" => "削除",
-"Enable User External Storage" => "ユーザの外部ストレージを有効にする",
-"Allow users to mount their own external storage" => "ユーザに外部ストレージのマウントを許可する",
+"Enable User External Storage" => "ユーザーの外部ストレージを有効にする",
+"Allow users to mount the following external storage" => "ユーザに以下の外部ストレージのマウントを許可する",
 "SSL root certificates" => "SSLルート証明書",
 "Import Root Certificate" => "ルート証明書をインポート"
 );
diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php
index 445d40e708..4953f91ce6 100644
--- a/apps/files_external/l10n/ka_GE.php
+++ b/apps/files_external/l10n/ka_GE.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "მომხმარებელი",
 "Delete" => "წაშლა",
 "Enable User External Storage" => "მომხმარებლის ექსტერნალ საცავის აქტივირება",
-"Allow users to mount their own external storage" => "მიეცით მომხმარებლებს თავისი ექსტერნალ საცავის მონტირების  უფლება",
 "SSL root certificates" => "SSL root სერთიფიკატები",
 "Import Root Certificate" => "Root სერთიფიკატის იმპორტირება"
 );
diff --git a/apps/files_external/l10n/km.php b/apps/files_external/l10n/km.php
index f7d9faa38c..4586f866a7 100644
--- a/apps/files_external/l10n/km.php
+++ b/apps/files_external/l10n/km.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Folder name" => "ឈ្មោះ​ថត",
+"Groups" => "ក្រុ",
+"Users" => "អ្នកប្រើ",
 "Delete" => "លុប"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
index 64d815a5bc..088a419e1c 100644
--- a/apps/files_external/l10n/ko.php
+++ b/apps/files_external/l10n/ko.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "사용자",
 "Delete" => "삭제",
 "Enable User External Storage" => "사용자 외부 저장소 사용",
-"Allow users to mount their own external storage" => "사용자별 외부 저장소 마운트 허용",
 "SSL root certificates" => "SSL 루트 인증서",
 "Import Root Certificate" => "루트 인증서 가져오기"
 );
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index 57cdfe6722..c96119c8b6 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Vartotojai",
 "Delete" => "Ištrinti",
 "Enable User External Storage" => "Įjungti vartotojų išorines saugyklas",
-"Allow users to mount their own external storage" => "Leisti vartotojams pridėti savo išorines saugyklas",
 "SSL root certificates" => "SSL sertifikatas",
 "Import Root Certificate" => "Įkelti pagrindinį sertifikatą"
 );
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
index d0db01a22b..18e5617889 100644
--- a/apps/files_external/l10n/lv.php
+++ b/apps/files_external/l10n/lv.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Lietotāji",
 "Delete" => "Dzēst",
 "Enable User External Storage" => "Aktivēt lietotāja ārējo krātuvi",
-"Allow users to mount their own external storage" => "Ļaut lietotājiem montēt pašiem savu ārējo krātuvi",
 "SSL root certificates" => "SSL saknes sertifikāti",
 "Import Root Certificate" => "Importēt saknes sertifikātus"
 );
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
index e410b398ac..b59bb138f1 100644
--- a/apps/files_external/l10n/mk.php
+++ b/apps/files_external/l10n/mk.php
@@ -18,7 +18,6 @@ $TRANSLATIONS = array(
 "Users" => "Корисници",
 "Delete" => "Избриши",
 "Enable User External Storage" => "Овозможи надворешни за корисници",
-"Allow users to mount their own external storage" => "Дозволи им на корисниците да монтираат свои надворешни дискови",
 "SSL root certificates" => "SSL root сертификати",
 "Import Root Certificate" => "Увези"
 );
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
index cb31ac8922..c103112dbe 100644
--- a/apps/files_external/l10n/nb_NO.php
+++ b/apps/files_external/l10n/nb_NO.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Brukere",
 "Delete" => "Slett",
 "Enable User External Storage" => "Aktiver ekstern lagring for bruker",
-"Allow users to mount their own external storage" => "Tillat brukere å koble til egne eksterne lagringsmedium",
 "SSL root certificates" => "SSL root-sertifikater",
 "Import Root Certificate" => "Importer root-sertifikat"
 );
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
index 35e63b09a3..4fa579775f 100644
--- a/apps/files_external/l10n/nl.php
+++ b/apps/files_external/l10n/nl.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Sta toegang toe",
 "Please provide a valid Dropbox app key and secret." => "Geef een geldige Dropbox key en secret.",
 "Error configuring Google Drive storage" => "Fout tijdens het configureren van Google Drive opslag",
+"Saved" => "Bewaard",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren.",
 "<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>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren.",
 "<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>Waarschuwing:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van ownCloud / WebDAV of GoogleDrive is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Gebruikers",
 "Delete" => "Verwijder",
 "Enable User External Storage" => "Externe opslag voor gebruikers activeren",
-"Allow users to mount their own external storage" => "Sta gebruikers toe om hun eigen externe opslag aan te koppelen",
+"Allow users to mount the following external storage" => "Sta gebruikers toe de volgende externe opslag aan te koppelen",
 "SSL root certificates" => "SSL root certificaten",
 "Import Root Certificate" => "Importeer root certificaat"
 );
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index f5501b9755..ece0620f75 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Udziel dostępu",
 "Please provide a valid Dropbox app key and secret." => "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.",
 "Error configuring Google Drive storage" => "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
+"Saved" => "Zapisano",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania.",
 "<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>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone.  Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go.",
 "<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>Ostrzeżenie:</b> Wsparcie dla  Curl w PHP nie jest zainstalowane lub włączone. Montowanie WebDAV lub GoogleDrive nie będzie możliwe. Skontaktuj się z administratorem w celu zainstalowania lub włączenia tej opcji.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Użytkownicy",
 "Delete" => "Usuń",
 "Enable User External Storage" => "Włącz zewnętrzne zasoby dyskowe użytkownika",
-"Allow users to mount their own external storage" => "Zezwalaj użytkownikom na montowanie  ich własnych zewnętrznych zasobów dyskowych",
+"Allow users to mount the following external storage" => "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe",
 "SSL root certificates" => "Główny certyfikat SSL",
 "Import Root Certificate" => "Importuj główny certyfikat"
 );
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
index f69bbc1ebe..fbb945c543 100644
--- a/apps/files_external/l10n/pt_BR.php
+++ b/apps/files_external/l10n/pt_BR.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Permitir acesso",
 "Please provide a valid Dropbox app key and secret." => "Por favor forneça um app key e secret válido do Dropbox",
 "Error configuring Google Drive storage" => "Erro ao configurar armazenamento do Google Drive",
+"Saved" => "Salvo",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> \"smbclient\" não está instalado. Impossível montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo.",
 "<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>Aviso:</b> O suporte para FTP do PHP não está ativado ou instalado. Impossível montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo.",
 "<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> Aviso: </b> O suport a Curl em PHP não está habilitado ou instalado. A montagem do ownCloud / WebDAV ou GoogleDrive não é possível. Por favor, solicite ao seu administrador do sistema instalá-lo.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Usuários",
 "Delete" => "Excluir",
 "Enable User External Storage" => "Habilitar Armazenamento Externo do Usuário",
-"Allow users to mount their own external storage" => "Permitir usuários a montar seus próprios armazenamentos externos",
+"Allow users to mount the following external storage" => "Permitir que usuários montem o seguinte armazenamento externo",
 "SSL root certificates" => "Certificados SSL raíz",
 "Import Root Certificate" => "Importar Certificado Raíz"
 );
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index 3f2afd33f0..eb4d8feb41 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Conceder acesso",
 "Please provide a valid Dropbox app key and secret." => "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.",
 "Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
+"Saved" => "Guardado",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Atenção:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar.",
 "<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>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar.",
 "<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>Atenção:<br> O suporte PHP para o Curl não está activado ou instalado. A montagem do ownCloud/WebDav ou GoolgeDriver não é possível. Por favor contacte o administrador para o instalar.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Utilizadores",
 "Delete" => "Eliminar",
 "Enable User External Storage" => "Activar Armazenamento Externo para o Utilizador",
-"Allow users to mount their own external storage" => "Permitir que os utilizadores montem o seu próprio armazenamento externo",
+"Allow users to mount the following external storage" => "Permitir que os utilizadores montem o seguinte armazenamento externo",
 "SSL root certificates" => "Certificados SSL de raiz",
 "Import Root Certificate" => "Importar Certificado Root"
 );
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index 7115d09ea9..a90b0299e1 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Permite accesul",
 "Please provide a valid Dropbox app key and secret." => "Prezintă te rog o cheie de Dropbox validă și parola",
 "Error configuring Google Drive storage" => "Eroare la configurarea mediului de stocare Google Drive",
+"Saved" => "Salvat",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Atenție:</b> \"smbclient\" nu este instalat. Montarea mediilor CIFS/SMB partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleaze.",
 "<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>Atenție:</b> suportul pentru FTP în PHP nu este activat sau instalat. Montarea mediilor FPT partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleze.",
 "<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>Atentie:</b> Suportul Curl nu este pornit / instalat in configuratia PHP! Montarea ownCloud / WebDAV / GoogleDrive nu este posibila! Intrebati administratorul sistemului despre aceasta problema!",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Utilizatori",
 "Delete" => "Șterge",
 "Enable User External Storage" => "Permite stocare externă pentru utilizatori",
-"Allow users to mount their own external storage" => "Permite utilizatorilor să monteze stocare externă proprie",
+"Allow users to mount the following external storage" => "Permite utilizatorilor să monteze următoarea unitate de stocare",
 "SSL root certificates" => "Certificate SSL root",
 "Import Root Certificate" => "Importă certificat root"
 );
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index 50c25acba0..8ed437839c 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Предоставление доступа",
 "Please provide a valid Dropbox app key and secret." => "Пожалуйста, предоставьте действующий ключ Dropbox и пароль.",
 "Error configuring Google Drive storage" => "Ошибка при настройке хранилища Google Drive",
+"Saved" => "Сохранено",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> \"smbclient\" не установлен. Подключение по CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Поддержка FTP не включена в PHP. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы включить.",
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Поддержка Curl в PHP не включена или не установлена. Подключение ownCloud / WebDAV или GoogleDrive невозможно. Попросите вашего системного администратора установить его.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Пользователи",
 "Delete" => "Удалить",
 "Enable User External Storage" => "Включить пользовательские внешние носители",
-"Allow users to mount their own external storage" => "Разрешить пользователям монтировать их собственные внешние носители",
+"Allow users to mount the following external storage" => "Разрешить пользователям монтировать следующую внешнюю систему хранения данных",
 "SSL root certificates" => "Корневые сертификаты SSL",
 "Import Root Certificate" => "Импортировать корневые сертификаты"
 );
diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php
index cad928acce..ac41f59634 100644
--- a/apps/files_external/l10n/si_LK.php
+++ b/apps/files_external/l10n/si_LK.php
@@ -16,7 +16,6 @@ $TRANSLATIONS = array(
 "Users" => "පරිශීලකයන්",
 "Delete" => "මකා දමන්න",
 "Enable User External Storage" => "පරිශීලක භාහිර ගබඩාවන් සක්‍රිය කරන්න",
-"Allow users to mount their own external storage" => "පරිශීලකයන්ට තමාගේම භාහිර ගබඩාවන් මවුන්ට් කිරීමේ අයිතිය දෙන්න",
 "SSL root certificates" => "SSL මූල සහතිකයන්",
 "Import Root Certificate" => "මූල සහතිකය ආයාත කරන්න"
 );
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index 664d97c43b..aa28898257 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Používatelia",
 "Delete" => "Zmazať",
 "Enable User External Storage" => "Povoliť externé úložisko",
-"Allow users to mount their own external storage" => "Povoliť používateľom pripojiť si vlastné externé úložisko",
 "SSL root certificates" => "Koreňové SSL certifikáty",
 "Import Root Certificate" => "Importovať koreňový certifikát"
 );
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
index b0fcbf9eb6..05e626fcf8 100644
--- a/apps/files_external/l10n/sl.php
+++ b/apps/files_external/l10n/sl.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Odobri dostop",
 "Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
 "Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive",
+"Saved" => "Shranjeno",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Opozorilo:</b> paket \"smbclient\" ni nameščen. Priklapljanje pogonov CIFS/SMB ne bo mogoče.",
 "<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>Opozorilo:</b> podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ne bo mogoče.",
 "<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>Opozorilo:</b> podpora za Curl v PHP ni omogočena ali pa ni nameščena. Priklapljanje točke ownCloud / WebDAV ali GoogleDrive zato ne bo mogoče. Zahtevane pakete je treba pred uporabo namestiti.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Uporabniki",
 "Delete" => "Izbriši",
 "Enable User External Storage" => "Omogoči zunanjo uporabniško podatkovno shrambo",
-"Allow users to mount their own external storage" => "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe",
+"Allow users to mount the following external storage" => "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb.",
 "SSL root certificates" => "Korenska potrdila SSL",
 "Import Root Certificate" => "Uvozi korensko potrdilo"
 );
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
index 2c0b0ab69e..183df674b9 100644
--- a/apps/files_external/l10n/sv.php
+++ b/apps/files_external/l10n/sv.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Användare",
 "Delete" => "Radera",
 "Enable User External Storage" => "Aktivera extern lagring för användare",
-"Allow users to mount their own external storage" => "Tillåt användare att montera egen extern lagring",
 "SSL root certificates" => "SSL rotcertifikat",
 "Import Root Certificate" => "Importera rotcertifikat"
 );
diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php
index bb663a4fcb..94ddaf9c5e 100644
--- a/apps/files_external/l10n/ta_LK.php
+++ b/apps/files_external/l10n/ta_LK.php
@@ -16,7 +16,6 @@ $TRANSLATIONS = array(
 "Users" => "பயனாளர்",
 "Delete" => "நீக்குக",
 "Enable User External Storage" => "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக",
-"Allow users to mount their own external storage" => "பயனாளர் அவர்களுடைய சொந்த வெளியக சேமிப்பை ஏற்ற அனுமதிக்க",
 "SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
 "Import Root Certificate" => "வேர் சான்றிதழை இறக்குமதி செய்க"
 );
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
index f2ea35f10f..a1a56a4d2e 100644
--- a/apps/files_external/l10n/th_TH.php
+++ b/apps/files_external/l10n/th_TH.php
@@ -18,7 +18,6 @@ $TRANSLATIONS = array(
 "Users" => "ผู้ใช้งาน",
 "Delete" => "ลบ",
 "Enable User External Storage" => "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้",
-"Allow users to mount their own external storage" => "อนุญาตให้ผู้ใช้งานสามารถชี้ตำแหน่งไปที่พื้นที่จัดเก็บข้อมูลภายนอกของตนเองได้",
 "SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
 "Import Root Certificate" => "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
 );
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
index 5d5e2b726a..a835d6f174 100644
--- a/apps/files_external/l10n/tr.php
+++ b/apps/files_external/l10n/tr.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Erişim sağlandı",
 "Please provide a valid Dropbox app key and secret." => "Lütfen Dropbox app key ve secret temin ediniz",
 "Error configuring Google Drive storage" => "Google Drive depo yapılandırma hatası",
+"Saved" => "Kaydedildi",
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Uyarı:</b> \"smbclient\" kurulu değil. CIFS/SMB paylaşımlarını bağlama işlemi mümkün olmadı. Lütfen kurulumu için sistem yöneticinize danışın.",
 "<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>Uyarı:</b> PHP içerisinde FTP desteği etkin veya yüklü değil. FTP paylaşımlarını bağlama işlemi mümkün olmadı. Lütfen kurulumu için sistem yöneticinize danışın.",
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask your system administrator to install it." => "<b>Uyarı:</b> PHP içerisinde Curl desteği etkin veya yüklü değil. OwnCloud / WebDAV veya GoogleDrive bağlama işlemi mümkün olmadı. Lütfen kurulumu için sistem yöneticinizde danışın.",
@@ -21,7 +22,7 @@ $TRANSLATIONS = array(
 "Users" => "Kullanıcılar",
 "Delete" => "Sil",
 "Enable User External Storage" => "Kullanıcılar için Harici Depolamayı Etkinleştir",
-"Allow users to mount their own external storage" => "Kullanıcıların kendi harici depolamalarını bağlamalarına izin ver",
+"Allow users to mount the following external storage" => "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver",
 "SSL root certificates" => "SSL kök sertifikaları",
 "Import Root Certificate" => "Kök Sertifikalarını İçe Aktar"
 );
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index e535b455d1..a7c028aa93 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Користувачі",
 "Delete" => "Видалити",
 "Enable User External Storage" => "Активувати користувацькі зовнішні сховища",
-"Allow users to mount their own external storage" => "Дозволити користувачам монтувати власні зовнішні сховища",
 "SSL root certificates" => "SSL корневі сертифікати",
 "Import Root Certificate" => "Імпортувати корневі сертифікати"
 );
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
index da8ac419cd..5fd00dc2bf 100644
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "Người dùng",
 "Delete" => "Xóa",
 "Enable User External Storage" => "Kích hoạt tính năng lưu trữ ngoài",
-"Allow users to mount their own external storage" => "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài của họ",
 "SSL root certificates" => "Chứng chỉ SSL root",
 "Import Root Certificate" => "Nhập Root Certificate"
 );
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
index 5e2c2e4fe0..bb85d0e4f4 100644
--- a/apps/files_external/l10n/zh_CN.php
+++ b/apps/files_external/l10n/zh_CN.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "用户",
 "Delete" => "删除",
 "Enable User External Storage" => "启用用户外部存储",
-"Allow users to mount their own external storage" => "允许用户挂载自有外部存储",
 "SSL root certificates" => "SSL根证书",
 "Import Root Certificate" => "导入根证书"
 );
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
index d85d18a1c3..7c256cd2ab 100644
--- a/apps/files_external/l10n/zh_TW.php
+++ b/apps/files_external/l10n/zh_TW.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Users" => "使用者",
 "Delete" => "刪除",
 "Enable User External Storage" => "啓用使用者外部儲存",
-"Allow users to mount their own external storage" => "允許使用者自行掛載他們的外部儲存",
 "SSL root certificates" => "SSL 根憑證",
 "Import Root Certificate" => "匯入根憑證"
 );
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 43275d36c0..472c3963d5 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -4,6 +4,8 @@
 *
 * @author Michael Gapczynski
 * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+* @copyright 2014 Vincent Petry <pvince81@owncloud.com>
+* @copyright 2014 Robin McCorkell <rmccorkell@karoshi.org.uk>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -19,15 +21,24 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+set_include_path(
+	get_include_path() . PATH_SEPARATOR .
+	\OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib'
+);
+
 /**
-* Class to configure the config/mount.php and data/$user/mount.php files
-*/
+ * Class to configure mount.json globally and for users
+ */
 class OC_Mount_Config {
+	// TODO: make this class non-static and give it a proper namespace
 
 	const MOUNT_TYPE_GLOBAL = 'global';
 	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
@@ -39,13 +50,14 @@ class OC_Mount_Config {
 	*/
 	public static function getBackends() {
 
+		// FIXME: do not rely on php key order for the options order in the UI
 		$backends['\OC\Files\Storage\Local']=array(
 				'backend' => 'Local',
 				'configuration' => array(
 					'datadir' => 'Location'));
 
 		$backends['\OC\Files\Storage\AmazonS3']=array(
-			'backend' => 'Amazon S3',
+			'backend' => 'Amazon S3 and compliant',
 			'configuration' => array(
 				'key' => 'Access Key',
 				'secret' => '*Secret Key',
@@ -111,11 +123,18 @@ class OC_Mount_Config {
 						'password' => '*Password',
 						'share' => 'Share',
 						'root' => '&Root'));
+				$backends['\OC\Files\Storage\SMB_OC'] = array(
+					'backend' => 'SMB / CIFS using OC login',
+					'configuration' => array(
+						'host' => 'URL',
+						'username_as_share' => '!Username as share',
+						'share' => '&Share',
+						'root' => '&Root'));
 			}
 		}
 
 		if(OC_Mount_Config::checkcurl()){
-		   	$backends['\OC\Files\Storage\DAV']=array(
+			$backends['\OC\Files\Storage\DAV']=array(
 				'backend' => 'WebDAV',
 				'configuration' => array(
 					'host' => 'URL',
@@ -123,7 +142,7 @@ class OC_Mount_Config {
 					'password' => '*Password',
 					'root' => '&Root',
 					'secure' => '!Secure https://'));
-		   	$backends['\OC\Files\Storage\OwnCloud']=array(
+			$backends['\OC\Files\Storage\OwnCloud']=array(
 				'backend' => 'ownCloud',
 				'configuration' => array(
 					'host' => 'URL',
@@ -155,6 +174,125 @@ class OC_Mount_Config {
 		return($backends);
 	}
 
+	/**
+	 * Hook that mounts the given user's visible mount points
+	 * @param array $data
+	 */
+	public static function initMountPointsHook($data) {
+		$mountPoints = self::getAbsoluteMountPoints($data['user']);
+		foreach ($mountPoints as $mountPoint => $options) {
+			\OC\Files\Filesystem::mount($options['class'], $options['options'], $mountPoint);
+		}
+	}
+
+	/**
+	 * Returns the mount points for the given user.
+	 * The mount point is relative to the data directory.
+	 *
+	 * @param string $user user
+	 * @return array of mount point string as key, mountpoint config as value
+	 */
+	public static function getAbsoluteMountPoints($user) {
+		$mountPoints = array();
+
+		$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
+		$mount_file = \OC_Config::getValue("mount_file", $datadir . "/mount.json");
+
+		//move config file to it's new position
+		if (is_file(\OC::$SERVERROOT . '/config/mount.json')) {
+			rename(\OC::$SERVERROOT . '/config/mount.json', $mount_file);
+		}
+
+		// Load system mount points
+		$mountConfig = self::readData(false);
+		if (isset($mountConfig[self::MOUNT_TYPE_GLOBAL])) {
+			foreach ($mountConfig[self::MOUNT_TYPE_GLOBAL] as $mountPoint => $options) {
+				$options['options'] = self::decryptPasswords($options['options']);
+				$mountPoints[$mountPoint] = $options;
+			}
+		}
+		if (isset($mountConfig[self::MOUNT_TYPE_GROUP])) {
+			foreach ($mountConfig[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
+				if (\OC_Group::inGroup($user, $group)) {
+					foreach ($mounts as $mountPoint => $options) {
+						$mountPoint = self::setUserVars($user, $mountPoint);
+						foreach ($options as &$option) {
+							$option = self::setUserVars($user, $option);
+						}
+						$options['options'] = self::decryptPasswords($options['options']);
+						$mountPoints[$mountPoint] = $options;
+					}
+				}
+			}
+		}
+		if (isset($mountConfig[self::MOUNT_TYPE_USER])) {
+			foreach ($mountConfig[self::MOUNT_TYPE_USER] as $mountUser => $mounts) {
+				if ($mountUser === 'all' or strtolower($mountUser) === strtolower($user)) {
+					foreach ($mounts as $mountPoint => $options) {
+						$mountPoint = self::setUserVars($user, $mountPoint);
+						foreach ($options as &$option) {
+							$option = self::setUserVars($user, $option);
+						}
+						$options['options'] = self::decryptPasswords($options['options']);
+						$mountPoints[$mountPoint] = $options;
+					}
+				}
+			}
+		}
+
+		// Load personal mount points
+		$mountConfig = self::readData(true);
+		if (isset($mountConfig[self::MOUNT_TYPE_USER][$user])) {
+			foreach ($mountConfig[self::MOUNT_TYPE_USER][$user] as $mountPoint => $options) {
+				$options['options'] = self::decryptPasswords($options['options']);
+				$mountPoints[$mountPoint] = $options;
+			}
+		}
+
+		return $mountPoints;
+	}
+
+	/**
+	 * fill in the correct values for $user
+	 *
+	 * @param string $user
+	 * @param string $input
+	 * @return string
+	 */
+	private static function setUserVars($user, $input) {
+		return str_replace('$user', $user, $input);
+	}
+
+
+	/**
+	* Get details on each of the external storage backends, used for the mount config UI
+	* Some backends are not available as a personal backend, f.e. Local and such that have
+	* been disabled by the admin.
+	*
+	* If a custom UI is needed, add the key 'custom' and a javascript file with that name will be loaded
+	* If the configuration parameter should be secret, add a '*' to the beginning of the value
+	* If the configuration parameter is a boolean, add a '!' to the beginning of the value
+	* If the configuration parameter is optional, add a '&' to the beginning of the value
+	* If the configuration parameter is hidden, add a '#' to the beginning of the value
+	* @return array
+	*/
+	public static function getPersonalBackends() {
+
+		$backends = self::getBackends();
+
+		// Remove local storage and other disabled storages
+		unset($backends['\OC\Files\Storage\Local']);
+
+		$allowed_backends = explode(',', OCP\Config::getAppValue('files_external', 'user_mounting_backends', ''));
+		foreach ($backends as $backend => $null) {
+			if (!in_array($backend, $allowed_backends)) {
+				unset($backends[$backend]);
+			}
+		}
+
+		return $backends;
+	}
+
 	/**
 	* Get the system mount points
 	* The returned array is not in the same format as getUserMountPoints()
@@ -171,20 +309,26 @@ class OC_Mount_Config {
 					if (strpos($mount['class'], 'OC_Filestorage_') !== false) {
 						$mount['class'] = '\OC\Files\Storage\\'.substr($mount['class'], 15);
 					}
+					$mount['options'] = self::decryptPasswords($mount['options']);
 					// Remove '/$user/files/' from mount point
 					$mountPoint = substr($mountPoint, 13);
-					// Merge the mount point into the current mount points
-					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
-						$system[$mountPoint]['applicable']['groups']
-							= array_merge($system[$mountPoint]['applicable']['groups'], array($group));
+
+					$config = array(
+						'class' => $mount['class'],
+						'mountpoint' => $mountPoint,
+						'backend' => $backends[$mount['class']]['backend'],
+						'options' => $mount['options'],
+						'applicable' => array('groups' => array($group), 'users' => array()),
+						'status' => self::getBackendStatus($mount['class'], $mount['options'], false)
+					);
+					$hash = self::makeConfigHash($config);
+					// If an existing config exists (with same class, mountpoint and options)
+					if (isset($system[$hash])) {
+						// add the groups into that config
+						$system[$hash]['applicable']['groups']
+							= array_merge($system[$hash]['applicable']['groups'], array($group));
 					} else {
-						$system[$mountPoint] = array(
-							'class' => $mount['class'],
-							'backend' => $backends[$mount['class']]['backend'],
-							'configuration' => $mount['options'],
-							'applicable' => array('groups' => array($group), 'users' => array()),
-							'status' => self::getBackendStatus($mount['class'], $mount['options'])
-						);
+						$system[$hash] = $config;
 					}
 				}
 			}
@@ -196,25 +340,30 @@ class OC_Mount_Config {
 					if (strpos($mount['class'], 'OC_Filestorage_') !== false) {
 						$mount['class'] = '\OC\Files\Storage\\'.substr($mount['class'], 15);
 					}
+					$mount['options'] = self::decryptPasswords($mount['options']);
 					// Remove '/$user/files/' from mount point
 					$mountPoint = substr($mountPoint, 13);
-					// Merge the mount point into the current mount points
-					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
-						$system[$mountPoint]['applicable']['users']
-							= array_merge($system[$mountPoint]['applicable']['users'], array($user));
+					$config = array(
+						'class' => $mount['class'],
+						'mountpoint' => $mountPoint,
+						'backend' => $backends[$mount['class']]['backend'],
+						'options' => $mount['options'],
+						'applicable' => array('groups' => array(), 'users' => array($user)),
+						'status' => self::getBackendStatus($mount['class'], $mount['options'], false)
+					);
+					$hash = self::makeConfigHash($config);
+					// If an existing config exists (with same class, mountpoint and options)
+					if (isset($system[$hash])) {
+						// add the users into that config
+						$system[$hash]['applicable']['users']
+							= array_merge($system[$hash]['applicable']['users'], array($user));
 					} else {
-						$system[$mountPoint] = array(
-							'class' => $mount['class'],
-							'backend' => $backends[$mount['class']]['backend'],
-							'configuration' => $mount['options'],
-							'applicable' => array('groups' => array(), 'users' => array($user)),
-							'status' => self::getBackendStatus($mount['class'], $mount['options'])
-						);
+						$system[$hash] = $config;
 					}
 				}
 			}
 		}
-		return $system;
+		return array_values($system);
 	}
 
 	/**
@@ -233,26 +382,37 @@ class OC_Mount_Config {
 				if (strpos($mount['class'], 'OC_Filestorage_') !== false) {
 					$mount['class'] = '\OC\Files\Storage\\'.substr($mount['class'], 15);
 				}
-				// Remove '/uid/files/' from mount point
-				$personal[substr($mountPoint, strlen($uid) + 8)] = array(
+				$mount['options'] = self::decryptPasswords($mount['options']);
+				$personal[] = array(
 					'class' => $mount['class'],
+					// Remove '/uid/files/' from mount point
+					'mountpoint' => substr($mountPoint, strlen($uid) + 8),
 					'backend' => $backends[$mount['class']]['backend'],
-					'configuration' => $mount['options'],
-					'status' => self::getBackendStatus($mount['class'], $mount['options'])
+					'options' => $mount['options'],
+					'status' => self::getBackendStatus($mount['class'], $mount['options'], true)
 				);
 			}
 		}
 		return $personal;
 	}
 
-	private static function getBackendStatus($class, $options) {
+	/**
+	 * Test connecting using the given backend configuration
+	 * @param string $class backend class name
+	 * @param array $options backend configuration options
+	 * @return bool true if the connection succeeded, false otherwise
+	 */
+	private static function getBackendStatus($class, $options, $isPersonal) {
+		if (self::$skipTest) {
+			return true;
+		}
 		foreach ($options as &$option) {
-			$option = str_replace('$user', OCP\User::getUser(), $option);
+			$option = self::setUserVars(OCP\User::getUser(), $option);
 		}
 		if (class_exists($class)) {
 			try {
 				$storage = new $class($options);
-				return $storage->test();
+				return $storage->test($isPersonal);
 			} catch (Exception $exception) {
 				\OCP\Util::logException('files_external', $exception);
 				return false;
@@ -287,18 +447,25 @@ class OC_Mount_Config {
 		if (!isset($backends[$class])) {
 			// invalid backend
 			return false;
-		}	
+		}
 		if ($isPersonal) {
 			// Verify that the mount point applies for the current user
-			// Prevent non-admin users from mounting local storage
-			if ($applicable !== OCP\User::getUser() || strtolower($class) === '\oc\files\storage\local') {
+			// Prevent non-admin users from mounting local storage and other disabled backends
+			$allowed_backends = self::getPersonalBackends();
+			if ($applicable != OCP\User::getUser() || !isset($allowed_backends[$class])) {
 				return false;
 			}
 			$mountPoint = '/'.$applicable.'/files/'.ltrim($mountPoint, '/');
 		} else {
 			$mountPoint = '/$user/files/'.ltrim($mountPoint, '/');
 		}
-		$mount = array($applicable => array($mountPoint => array('class' => $class, 'options' => $classOptions)));
+
+		$mount = array($applicable => array(
+			$mountPoint => array(
+				'class' => $class,
+				'options' => self::encryptPasswords($classOptions))
+			)
+		);
 		$mountPoints = self::readData($isPersonal);
 		// Merge the new mount point into the current mount points
 		if (isset($mountPoints[$mountType])) {
@@ -312,7 +479,7 @@ class OC_Mount_Config {
 			$mountPoints[$mountType] = $mount;
 		}
 		self::writeData($isPersonal, $mountPoints);
-		return self::getBackendStatus($class, $classOptions);
+		return self::getBackendStatus($class, $classOptions, $isPersonal);
 	}
 
 	/**
@@ -389,7 +556,12 @@ class OC_Mount_Config {
 			$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/');
 			$file = \OC_Config::getValue('mount_file', $datadir . '/mount.json');
 		}
-		$content = json_encode($data);
+		$options = 0;
+		if (defined('JSON_PRETTY_PRINT')) {
+			// only for PHP >= 5.4
+			$options = JSON_PRETTY_PRINT;
+		}
+		$content = json_encode($data, $options);
 		@file_put_contents($file, $content);
 		@chmod($file, 0640);
 	}
@@ -446,7 +618,7 @@ class OC_Mount_Config {
 	 */
 	public static function checksmbclient() {
 		if(function_exists('shell_exec')) {
-			$output=shell_exec('which smbclient 2> /dev/null');
+			$output=shell_exec('command -v smbclient 2> /dev/null');
 			return !empty($output);
 		}else{
 			return false;
@@ -491,4 +663,87 @@ class OC_Mount_Config {
 
 		return $txt;
 	}
+
+	/**
+	 * Encrypt passwords in the given config options
+	 * @param array $options mount options
+	 * @return array updated options
+	 */
+	private static function encryptPasswords($options) {
+		if (isset($options['password'])) {
+			$options['password_encrypted'] = self::encryptPassword($options['password']);
+			// do not unset the password, we want to keep the keys order
+			// on load... because that's how the UI currently works
+			$options['password'] = '';
+		}
+		return $options;
+	}
+
+	/**
+	 * Decrypt passwords in the given config options
+	 * @param array $options mount options
+	 * @return array updated options
+	 */
+	private static function decryptPasswords($options) {
+		// note: legacy options might still have the unencrypted password in the "password" field
+		if (isset($options['password_encrypted'])) {
+			$options['password'] = self::decryptPassword($options['password_encrypted']);
+			unset($options['password_encrypted']);
+		}
+		return $options;
+	}
+
+	/**
+	 * Encrypt a single password
+	 * @param string $password plain text password
+	 * @return encrypted password
+	 */
+	private static function encryptPassword($password) {
+		$cipher = self::getCipher();
+		$iv = \OCP\Util::generateRandomBytes(16);
+		$cipher->setIV($iv);
+		return base64_encode($iv . $cipher->encrypt($password));
+	}
+
+	/**
+	 * Decrypts a single password
+	 * @param string $encryptedPassword encrypted password
+	 * @return plain text password
+	 */
+	private static function decryptPassword($encryptedPassword) {
+		$cipher = self::getCipher();
+		$binaryPassword = base64_decode($encryptedPassword);
+		$iv = substr($binaryPassword, 0, 16);
+		$cipher->setIV($iv);
+		$binaryPassword = substr($binaryPassword, 16);
+		return $cipher->decrypt($binaryPassword);
+	}
+
+	/**
+	 * Returns the encryption cipher
+	 */
+	private static function getCipher() {
+		if (!class_exists('Crypt_AES', false)) {
+			include('Crypt/AES.php');
+		}
+		$cipher = new Crypt_AES(CRYPT_AES_MODE_CBC);
+		$cipher->setKey(\OCP\Config::getSystemValue('passwordsalt'));
+		return $cipher;
+	}
+
+	/**
+	 * Computes a hash based on the given configuration.
+	 * This is mostly used to find out whether configurations
+	 * are the same.
+	 */
+	private static function makeConfigHash($config) {
+		$data = json_encode(
+			array(
+				'c' => $config['class'],
+				'm' => $config['mountpoint'],
+				'o' => $config['options']
+			)
+		);
+		return hash('md5', $data);
+	}
 }
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index c5fba92ee6..f3f3b3ed7f 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -37,7 +37,7 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 				$this->share = substr($this->share, 0, -1);
 			}
 		} else {
-			throw new \Exception();
+			throw new \Exception('Invalid configuration');
 		}
 	}
 
diff --git a/apps/files_external/lib/smb_oc.php b/apps/files_external/lib/smb_oc.php
new file mode 100644
index 0000000000..0c79c06c5d
--- /dev/null
+++ b/apps/files_external/lib/smb_oc.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright (c) 2014 Robin McCorkell <rmccorkell@karoshi.org.uk>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Files\Storage;
+
+require_once __DIR__ . '/../3rdparty/smb4php/smb.php';
+
+class SMB_OC extends \OC\Files\Storage\SMB {
+	private $username_as_share;
+
+	public function __construct($params) {
+		if (isset($params['host']) && \OC::$session->exists('smb-credentials')) {
+			$host=$params['host'];
+			$this->username_as_share = ($params['username_as_share'] === 'true');
+
+			$params_auth = \OC::$session->get('smb-credentials');
+			$user = \OC::$session->get('loginname');
+			$password = $params_auth['password'];
+
+			$root=isset($params['root'])?$params['root']:'/';
+			$share = '';
+
+			if ($this->username_as_share) {
+				$share = '/'.$user;
+			} elseif (isset($params['share'])) {
+				$share = $params['share'];
+			} else {
+				throw new \Exception();
+			}
+			parent::__construct(array(
+				"user" => $user,
+				"password" => $password,
+				"host" => $host,
+				"share" => $share,
+				"root" => $root
+			));
+		} else {
+			throw new \Exception();
+		}
+	}
+
+	public static function login( $params ) {
+		\OC::$session->set('smb-credentials', $params);
+	}
+
+	public function isSharable($path) {
+		return false;
+	}
+
+	public function test($isPersonal = true) {
+		if ($isPersonal) {
+			if ($this->stat('')) {
+				return true;
+			}
+			return false;
+		} else {
+			$smb = new \smb();
+			$pu = $smb->parse_url($this->constructUrl(''));
+
+			// Attempt to connect anonymously
+			$pu['user'] = '';
+			$pu['pass'] = '';
+
+			// Share cannot be checked if dynamic
+			if ($this->username_as_share) {
+				if ($smb->look($pu)) {
+					return true;
+				} else {
+					return false;
+				}
+			}
+			if (!$pu['share']) {
+				return false;
+			}
+
+			// The following error messages are expected due to anonymous login
+			$regexp = array(
+				'(NT_STATUS_ACCESS_DENIED)' => 'skip'
+			) + $smb->getRegexp();
+
+			if ($smb->client("-d 0 " . escapeshellarg('//' . $pu['host'] . '/' . $pu['share']) . " -c exit", $pu, $regexp)) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}
+}
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 7a56fcfc8b..1337d9f581 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -251,6 +251,10 @@ class Swift extends \OC\Files\Storage\Common {
 			$mtime = $object->extra_headers['X-Object-Meta-Timestamp'];
 		}
 
+		if (!empty($mtime)) {
+			$mtime = floor($mtime);
+		}
+
 		$stat = array();
 		$stat['size'] = $object->content_length;
 		$stat['mtime'] = $mtime;
@@ -370,7 +374,7 @@ class Swift extends \OC\Files\Storage\Common {
 					'X-Object-Meta-Timestamp' => $mtime
 				)
 			);
-			return $object->Update($settings);
+			return $object->UpdateMetadata($settings);
 		} else {
 			$object = $this->container->DataObject();
 			if (is_null($mtime)) {
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 9afe73aebd..279ae71693 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -8,7 +8,7 @@
 
 namespace OC\Files\Storage;
 
-class DAV extends \OC\Files\Storage\Common{
+class DAV extends \OC\Files\Storage\Common {
 	private $password;
 	private $user;
 	private $host;
@@ -21,7 +21,7 @@ class DAV extends \OC\Files\Storage\Common{
 	 */
 	private $client;
 
-	private static $tempFiles=array();
+	private static $tempFiles = array();
 
 	public function __construct($params) {
 		if (isset($params['host']) && isset($params['user']) && isset($params['password'])) {
@@ -29,9 +29,9 @@ class DAV extends \OC\Files\Storage\Common{
 			//remove leading http[s], will be generated in createBaseUri()
 			if (substr($host, 0, 8) == "https://") $host = substr($host, 8);
 			else if (substr($host, 0, 7) == "http://") $host = substr($host, 7);
-			$this->host=$host;
-			$this->user=$params['user'];
-			$this->password=$params['password'];
+			$this->host = $host;
+			$this->user = $params['user'];
+			$this->password = $params['password'];
 			if (isset($params['secure'])) {
 				if (is_string($params['secure'])) {
 					$this->secure = ($params['secure'] === 'true');
@@ -42,25 +42,25 @@ class DAV extends \OC\Files\Storage\Common{
 				$this->secure = false;
 			}
 			if ($this->secure === true) {
-				$certPath=\OC_User::getHome(\OC_User::getUser()) . '/files_external/rootcerts.crt';
+				$certPath = \OC_User::getHome(\OC_User::getUser()) . '/files_external/rootcerts.crt';
 				if (file_exists($certPath)) {
-					$this->certPath=$certPath;
+					$this->certPath = $certPath;
 				}
 			}
-			$this->root=isset($params['root'])?$params['root']:'/';
-			if ( ! $this->root || $this->root[0]!='/') {
-				$this->root='/'.$this->root;
+			$this->root = isset($params['root']) ? $params['root'] : '/';
+			if (!$this->root || $this->root[0] != '/') {
+				$this->root = '/' . $this->root;
 			}
-			if (substr($this->root, -1, 1)!='/') {
-				$this->root.='/';
+			if (substr($this->root, -1, 1) != '/') {
+				$this->root .= '/';
 			}
 		} else {
 			throw new \Exception();
 		}
 	}
 
-	private function init(){
-		if($this->ready) {
+	private function init() {
+		if ($this->ready) {
 			return;
 		}
 		$this->ready = true;
@@ -78,28 +78,28 @@ class DAV extends \OC\Files\Storage\Common{
 		}
 	}
 
-	public function getId(){
+	public function getId() {
 		return 'webdav::' . $this->user . '@' . $this->host . '/' . $this->root;
 	}
 
 	protected function createBaseUri() {
-		$baseUri='http';
+		$baseUri = 'http';
 		if ($this->secure) {
-			$baseUri.='s';
+			$baseUri .= 's';
 		}
-		$baseUri.='://'.$this->host.$this->root;
+		$baseUri .= '://' . $this->host . $this->root;
 		return $baseUri;
 	}
 
 	public function mkdir($path) {
 		$this->init();
-		$path=$this->cleanPath($path);
+		$path = $this->cleanPath($path);
 		return $this->simpleResponse('MKCOL', $path, null, 201);
 	}
 
 	public function rmdir($path) {
 		$this->init();
-		$path=$this->cleanPath($path) . '/';
+		$path = $this->cleanPath($path) . '/';
 		// FIXME: some WebDAV impl return 403 when trying to DELETE
 		// a non-empty folder
 		return $this->simpleResponse('DELETE', $path, null, 204);
@@ -107,35 +107,35 @@ class DAV extends \OC\Files\Storage\Common{
 
 	public function opendir($path) {
 		$this->init();
-		$path=$this->cleanPath($path);
+		$path = $this->cleanPath($path);
 		try {
-			$response=$this->client->propfind($this->encodePath($path), array(), 1);
-			$id=md5('webdav'.$this->root.$path);
+			$response = $this->client->propfind($this->encodePath($path), array(), 1);
+			$id = md5('webdav' . $this->root . $path);
 			$content = array();
-			$files=array_keys($response);
-			array_shift($files);//the first entry is the current directory
+			$files = array_keys($response);
+			array_shift($files); //the first entry is the current directory
 			foreach ($files as $file) {
 				$file = urldecode(basename($file));
-				$content[]=$file;
+				$content[] = $file;
 			}
 			\OC\Files\Stream\Dir::register($id, $content);
-			return opendir('fakedir://'.$id);
-		} catch(\Exception $e) {
+			return opendir('fakedir://' . $id);
+		} catch (\Exception $e) {
 			return false;
 		}
 	}
 
 	public function filetype($path) {
 		$this->init();
-		$path=$this->cleanPath($path);
+		$path = $this->cleanPath($path);
 		try {
-			$response=$this->client->propfind($this->encodePath($path), array('{DAV:}resourcetype'));
+			$response = $this->client->propfind($this->encodePath($path), array('{DAV:}resourcetype'));
 			$responseType = array();
 			if (isset($response["{DAV:}resourcetype"])) {
-				$responseType=$response["{DAV:}resourcetype"]->resourceType;
+				$responseType = $response["{DAV:}resourcetype"]->resourceType;
 			}
-			return (count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
-		} catch(\Exception $e) {
+			return (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
+		} catch (\Exception $e) {
 			error_log($e->getMessage());
 			\OCP\Util::writeLog("webdav client", \OCP\Util::sanitizeHTML($e->getMessage()), \OCP\Util::ERROR);
 			return false;
@@ -144,11 +144,11 @@ class DAV extends \OC\Files\Storage\Common{
 
 	public function file_exists($path) {
 		$this->init();
-		$path=$this->cleanPath($path);
+		$path = $this->cleanPath($path);
 		try {
 			$this->client->propfind($this->encodePath($path), array('{DAV:}resourcetype'));
-			return true;//no 404 exception
-		} catch(\Exception $e) {
+			return true; //no 404 exception
+		} catch (\Exception $e) {
 			return false;
 		}
 	}
@@ -160,34 +160,34 @@ class DAV extends \OC\Files\Storage\Common{
 
 	public function fopen($path, $mode) {
 		$this->init();
-		$path=$this->cleanPath($path);
-		switch($mode) {
+		$path = $this->cleanPath($path);
+		switch ($mode) {
 			case 'r':
 			case 'rb':
-				if ( ! $this->file_exists($path)) {
+				if (!$this->file_exists($path)) {
 					return false;
 				}
 				//straight up curl instead of sabredav here, sabredav put's the entire get result in memory
 				$curl = curl_init();
 				$fp = fopen('php://temp', 'r+');
-				curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password);
-				curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().$this->encodePath($path));
+				curl_setopt($curl, CURLOPT_USERPWD, $this->user . ':' . $this->password);
+				curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . $this->encodePath($path));
 				curl_setopt($curl, CURLOPT_FILE, $fp);
 				curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
 				if ($this->secure === true) {
 					curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
 					curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
-					if($this->certPath){
+					if ($this->certPath) {
 						curl_setopt($curl, CURLOPT_CAINFO, $this->certPath);
 					}
 				}
-				
-				curl_exec ($curl);
+
+				curl_exec($curl);
 				$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 				if ($statusCode !== 200) {
 					\OCP\Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, \OCP\Util::ERROR);
 				}
-				curl_close ($curl);
+				curl_close($curl);
 				rewind($fp);
 				return $fp;
 			case 'w':
@@ -203,18 +203,19 @@ class DAV extends \OC\Files\Storage\Common{
 			case 'c':
 			case 'c+':
 				//emulate these
-				if (strrpos($path, '.')!==false) {
-					$ext=substr($path, strrpos($path, '.'));
+				if (strrpos($path, '.') !== false) {
+					$ext = substr($path, strrpos($path, '.'));
 				} else {
-					$ext='';
+					$ext = '';
+				}
+				if ($this->file_exists($path)) {
+					$tmpFile = $this->getCachedFile($path);
+				} else {
+					$tmpFile = \OCP\Files::tmpFile($ext);
 				}
-				$tmpFile = \OCP\Files::tmpFile($ext);
 				\OC\Files\Stream\Close::registerCallback($tmpFile, array($this, 'writeBack'));
-				if($this->file_exists($path)) {
-					$this->getFile($path, $tmpFile);
-				}
-				self::$tempFiles[$tmpFile]=$path;
-				return fopen('close://'.$tmpFile, $mode);
+				self::$tempFiles[$tmpFile] = $path;
+				return fopen('close://' . $tmpFile, $mode);
 		}
 	}
 
@@ -227,32 +228,31 @@ class DAV extends \OC\Files\Storage\Common{
 
 	public function free_space($path) {
 		$this->init();
-		$path=$this->cleanPath($path);
+		$path = $this->cleanPath($path);
 		try {
-			$response=$this->client->propfind($this->encodePath($path), array('{DAV:}quota-available-bytes'));
+			$response = $this->client->propfind($this->encodePath($path), array('{DAV:}quota-available-bytes'));
 			if (isset($response['{DAV:}quota-available-bytes'])) {
 				return (int)$response['{DAV:}quota-available-bytes'];
 			} else {
 				return \OC\Files\SPACE_UNKNOWN;
 			}
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			return \OC\Files\SPACE_UNKNOWN;
 		}
 	}
 
-	public function touch($path, $mtime=null) {
+	public function touch($path, $mtime = null) {
 		$this->init();
 		if (is_null($mtime)) {
-			$mtime=time();
+			$mtime = time();
 		}
-		$path=$this->cleanPath($path);
+		$path = $this->cleanPath($path);
 
 		// if file exists, update the mtime, else create a new empty file
 		if ($this->file_exists($path)) {
 			try {
 				$this->client->proppatch($this->encodePath($path), array('{DAV:}lastmodified' => $mtime));
-			}
-			catch (\Sabre_DAV_Exception_NotImplemented $e) {
+			} catch (\Sabre_DAV_Exception_NotImplemented $e) {
 				return false;
 			}
 		} else {
@@ -261,23 +261,13 @@ class DAV extends \OC\Files\Storage\Common{
 		return true;
 	}
 
-	/**
-	 * @param string $path
-	 * @param string $target
-	 */
-	public function getFile($path, $target) {
+	protected function uploadFile($path, $target) {
 		$this->init();
-		$source=$this->fopen($path, 'r');
-		file_put_contents($target, $source);
-	}
-
-	public function uploadFile($path, $target) {
-		$this->init();
-		$source=fopen($path, 'r');
+		$source = fopen($path, 'r');
 
 		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_USERPWD, $this->user.':'.$this->password);
-		curl_setopt($curl, CURLOPT_URL, $this->createBaseUri().str_replace(' ', '%20', $target));
+		curl_setopt($curl, CURLOPT_USERPWD, $this->user . ':' . $this->password);
+		curl_setopt($curl, CURLOPT_URL, $this->createBaseUri() . str_replace(' ', '%20', $target));
 		curl_setopt($curl, CURLOPT_BINARYTRANSFER, true);
 		curl_setopt($curl, CURLOPT_INFILE, $source); // file pointer
 		curl_setopt($curl, CURLOPT_INFILESIZE, filesize($path));
@@ -285,26 +275,29 @@ class DAV extends \OC\Files\Storage\Common{
 		if ($this->secure === true) {
 			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
 			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
-			if($this->certPath){
+			if ($this->certPath) {
 				curl_setopt($curl, CURLOPT_CAINFO, $this->certPath);
 			}
 		}
-		curl_exec ($curl);
+		curl_exec($curl);
 		$statusCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 		if ($statusCode !== 200) {
 			\OCP\Util::writeLog("webdav client", 'curl GET ' . curl_getinfo($curl, CURLINFO_EFFECTIVE_URL) . ' returned status code ' . $statusCode, \OCP\Util::ERROR);
 		}
-		curl_close ($curl);
+		curl_close($curl);
+		$this->removeCachedFile($target);
 	}
 
 	public function rename($path1, $path2) {
 		$this->init();
 		$path1 = $this->encodePath($this->cleanPath($path1));
-		$path2 = $this->createBaseUri().$this->encodePath($this->cleanPath($path2));
+		$path2 = $this->createBaseUri() . $this->encodePath($this->cleanPath($path2));
 		try {
-			$this->client->request('MOVE', $path1, null, array('Destination'=>$path2));
+			$this->client->request('MOVE', $path1, null, array('Destination' => $path2));
+			$this->removeCachedFile($path1);
+			$this->removeCachedFile($path2);
 			return true;
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			return false;
 		}
 	}
@@ -312,47 +305,48 @@ class DAV extends \OC\Files\Storage\Common{
 	public function copy($path1, $path2) {
 		$this->init();
 		$path1 = $this->encodePath($this->cleanPath($path1));
-		$path2 = $this->createBaseUri().$this->encodePath($this->cleanPath($path2));
+		$path2 = $this->createBaseUri() . $this->encodePath($this->cleanPath($path2));
 		try {
-			$this->client->request('COPY', $path1, null, array('Destination'=>$path2));
+			$this->client->request('COPY', $path1, null, array('Destination' => $path2));
+			$this->removeCachedFile($path2);
 			return true;
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			return false;
 		}
 	}
 
 	public function stat($path) {
 		$this->init();
-		$path=$this->cleanPath($path);
+		$path = $this->cleanPath($path);
 		try {
 			$response = $this->client->propfind($this->encodePath($path), array('{DAV:}getlastmodified', '{DAV:}getcontentlength'));
 			return array(
-				'mtime'=>strtotime($response['{DAV:}getlastmodified']),
-				'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
+				'mtime' => strtotime($response['{DAV:}getlastmodified']),
+				'size' => (int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
 			);
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			return array();
 		}
 	}
 
 	public function getMimeType($path) {
 		$this->init();
-		$path=$this->cleanPath($path);
+		$path = $this->cleanPath($path);
 		try {
-			$response=$this->client->propfind($this->encodePath($path), array('{DAV:}getcontenttype', '{DAV:}resourcetype'));
+			$response = $this->client->propfind($this->encodePath($path), array('{DAV:}getcontenttype', '{DAV:}resourcetype'));
 			$responseType = array();
 			if (isset($response["{DAV:}resourcetype"])) {
-				$responseType=$response["{DAV:}resourcetype"]->resourceType;
+				$responseType = $response["{DAV:}resourcetype"]->resourceType;
 			}
-			$type=(count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
-			if ($type=='dir') {
+			$type = (count($responseType) > 0 and $responseType[0] == "{DAV:}collection") ? 'dir' : 'file';
+			if ($type == 'dir') {
 				return 'httpd/unix-directory';
 			} elseif (isset($response['{DAV:}getcontenttype'])) {
 				return $response['{DAV:}getcontenttype'];
 			} else {
 				return false;
 			}
-		} catch(\Exception $e) {
+		} catch (\Exception $e) {
 			return false;
 		}
 	}
@@ -368,6 +362,7 @@ class DAV extends \OC\Files\Storage\Common{
 
 	/**
 	 * URL encodes the given path but keeps the slashes
+	 *
 	 * @param string $path to encode
 	 * @return string encoded path
 	 */
@@ -382,11 +377,11 @@ class DAV extends \OC\Files\Storage\Common{
 	 * @param integer $expected
 	 */
 	private function simpleResponse($method, $path, $body, $expected) {
-		$path=$this->cleanPath($path);
+		$path = $this->cleanPath($path);
 		try {
-			$response=$this->client->request($method, $this->encodePath($path), $body);
-			return $response['statusCode']==$expected;
-		} catch(\Exception $e) {
+			$response = $this->client->request($method, $this->encodePath($path), $body);
+			return $response['statusCode'] == $expected;
+		} catch (\Exception $e) {
 			return false;
 		}
 	}
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 90f5e15953..90d7afed28 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -22,9 +22,8 @@
 
 OCP\Util::addScript('files_external', 'settings');
 OCP\Util::addStyle('files_external', 'settings');
-$backends = OC_Mount_Config::getBackends();
-// Remove local storage
-unset($backends['\OC\Files\Storage\Local']);
+$backends = OC_Mount_Config::getPersonalBackends();
+
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('isAdminPage', false);
 $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 31183409e3..5b62b54220 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -26,10 +26,26 @@ OCP\Util::addScript('files_external', 'settings');
 OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min');
 OCP\Util::addStyle('files_external', 'settings');
 OCP\Util::addStyle('3rdparty', 'chosen/chosen');
+
+$backends = OC_Mount_Config::getBackends();
+$personal_backends = array();
+$enabled_backends = explode(',', OCP\Config::getAppValue('files_external', 'user_mounting_backends', ''));
+foreach ($backends as $class => $backend)
+{
+	if ($class != '\OC\Files\Storage\Local')
+	{
+		$personal_backends[$class] = array(
+			'backend'	=> $backend['backend'],
+			'enabled'	=> in_array($class, $enabled_backends),
+		);
+	}
+}
+
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('isAdminPage', true);
 $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
-$tmpl->assign('backends', OC_Mount_Config::getBackends());
+$tmpl->assign('backends', $backends);
+$tmpl->assign('personal_backends', $personal_backends);
 $tmpl->assign('groups', OC_Group::getGroups());
 $tmpl->assign('users', OCP\User::getUsers());
 $tmpl->assign('userDisplayNames', OC_User::getDisplayNames());
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 3ca16c3c7a..8023866637 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -16,17 +16,17 @@
 			</thead>
 			<tbody width="100%">
 			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
-			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
-				<tr <?php print_unescaped(($mountPoint != '') ? 'class="'.OC_Util::sanitizeHTML($mount['class']).'"' : 'id="addMountPoint"'); ?>>
+			<?php foreach ($_['mounts'] as $mount): ?>
+				<tr <?php print_unescaped(($mount['mountpoint'] !== '') ? 'class="'.OC_Util::sanitizeHTML($mount['class']).'"' : 'id="addMountPoint"'); ?>>
 					<td class="status">
 					<?php if (isset($mount['status'])): ?>
 						<span class="<?php p(($mount['status']) ? 'success' : 'error'); ?>"></span>
 					<?php endif; ?>
 					</td>
 					<td class="mountPoint"><input type="text" name="mountPoint"
-												  value="<?php p($mountPoint); ?>"
+												  value="<?php p($mount['mountpoint']); ?>"
 												  placeholder="<?php p($l->t('Folder name')); ?>" /></td>
-					<?php if ($mountPoint == ''): ?>
+					<?php if ($mount['mountpoint'] == ''): ?>
 						<td class="backend">
 							<select id="selectBackend" data-configurations='<?php print_unescaped(json_encode($_['backends'])); ?>'>
 								<option value="" disabled selected
@@ -41,32 +41,35 @@
 							data-class="<?php p($mount['class']); ?>"><?php p($mount['backend']); ?></td>
 					<?php endif; ?>
 					<td class ="configuration" width="100%">
-						<?php if (isset($mount['configuration'])): ?>
-							<?php foreach ($mount['configuration'] as $parameter => $value): ?>
+						<?php if (isset($mount['options'])): ?>
+							<?php foreach ($mount['options'] as $parameter => $value): ?>
 								<?php if (isset($_['backends'][$mount['class']]['configuration'][$parameter])): ?>
-									<?php $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter]; ?>
-									<?php if (strpos($placeholder, '*') !== false): ?>
+									<?php
+										$placeholder = $_['backends'][$mount['class']]['configuration'][$parameter];
+										$is_optional = FALSE;
+										if (strpos($placeholder, '&') === 0) {
+											$is_optional = TRUE;
+											$placeholder = substr($placeholder, 1);
+										}
+									?>
+									<?php if (strpos($placeholder, '*') === 0): ?>
 										<input type="password"
+											   <?php if ($is_optional): ?> class="optional"<?php endif; ?>
 											   data-parameter="<?php p($parameter); ?>"
 											   value="<?php p($value); ?>"
 											   placeholder="<?php p(substr($placeholder, 1)); ?>" />
-									<?php elseif (strpos($placeholder, '!') !== false): ?>
+									<?php elseif (strpos($placeholder, '!') === 0): ?>
 										<label><input type="checkbox"
 													  data-parameter="<?php p($parameter); ?>"
 													  <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
 													  /><?php p(substr($placeholder, 1)); ?></label>
-									<?php elseif (strpos($placeholder, '&') !== false): ?>
-										<input type="text"
-											   class="optional"
-											   data-parameter="<?php p($parameter); ?>"
-											   value="<?php p($value); ?>"
-											   placeholder="<?php p(substr($placeholder, 1)); ?>" />
-									<?php elseif (strpos($placeholder, '#') !== false): ?>
+									<?php elseif (strpos($placeholder, '#') === 0): ?>
 										<input type="hidden"
 											   data-parameter="<?php p($parameter); ?>"
 											   value="<?php p($value); ?>" />
 									<?php else: ?>
 										<input type="text"
+											   <?php if ($is_optional): ?> class="optional"<?php endif; ?>
 											   data-parameter="<?php p($parameter); ?>"
 											   value="<?php p($value); ?>"
 											   placeholder="<?php p($placeholder); ?>" />
@@ -108,7 +111,7 @@
 							</select>
 						</td>
 					<?php endif; ?>
-					<td <?php if ($mountPoint != ''): ?>class="remove"
+					<td <?php if ($mount['mountpoint'] != ''): ?>class="remove"
 						<?php else: ?>style="visibility:hidden;"
 						<?php endif ?>><img alt="<?php p($l->t('Delete')); ?>"
 											title="<?php p($l->t('Delete')); ?>"
@@ -122,12 +125,18 @@
 
 		<?php if ($_['isAdminPage']): ?>
 			<br />
-			<input type="checkbox"
-				   name="allowUserMounting"
-				   id="allowUserMounting"
-				   value="1" <?php if ($_['allowUserMounting'] == 'yes') print_unescaped(' checked="checked"'); ?> />
-			<label for="allowUserMounting"><?php p($l->t('Enable User External Storage')); ?></label><br/>
-			<em><?php p($l->t('Allow users to mount their own external storage')); ?></em>
+			<input type="checkbox" name="allowUserMounting" id="allowUserMounting"
+				value="1" <?php if ($_['allowUserMounting'] == 'yes') print_unescaped(' checked="checked"'); ?> />
+			<label for="allowUserMounting"><?php p($l->t('Enable User External Storage')); ?></label> <span id="userMountingMsg" class="msg"></span>
+
+			<p id="userMountingBackups"<?php if ($_['allowUserMounting'] != 'yes'): ?> class="hidden"<?php endif; ?>>
+				<?php p($l->t('Allow users to mount the following external storage')); ?><br />
+				<?php $i = 0; foreach ($_['personal_backends'] as $class => $backend): ?>
+					<input type="checkbox" id="allowUserMountingBackends<?php p($i); ?>" name="allowUserMountingBackends[]" value="<?php p($class); ?>" <?php if ($backend['enabled']) print_unescaped(' checked="checked"'); ?> />
+					<label for="allowUserMountingBackends<?php p($i); ?>"><?php p($backend['backend']); ?></label> <br />
+					<?php $i++; ?>
+				<?php endforeach; ?>
+			</p>
 		<?php endif; ?>
 	</fieldset>
 </form>
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index 24ebcf5134..c89874c94d 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -34,6 +34,90 @@ 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;
+
+	const TEST_USER1 = 'user1';
+	const TEST_USER2 = 'user2';
+	const TEST_GROUP1 = 'group1';
+	const TEST_GROUP2 = 'group2';
+
+	public function setUp() {
+		\OC_User::createUser(self::TEST_USER1, self::TEST_USER1);
+		\OC_User::createUser(self::TEST_USER2, self::TEST_USER2);
+
+		\OC_Group::createGroup(self::TEST_GROUP1);
+		\OC_Group::addToGroup(self::TEST_USER1, self::TEST_GROUP1);
+		\OC_Group::createGroup(self::TEST_GROUP2);
+		\OC_Group::addToGroup(self::TEST_USER2, self::TEST_GROUP2);
+
+		\OC_User::setUserId(self::TEST_USER1);
+		$this->userHome = \OC_User::getHome(self::TEST_USER1);
+		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;
+
+		\OC_User::deleteUser(self::TEST_USER2);
+		\OC_User::deleteUser(self::TEST_USER1);
+		\OC_Group::deleteGroup(self::TEST_GROUP1);
+		\OC_Group::deleteGroup(self::TEST_GROUP2);
+
+		@unlink($this->dataDir . '/mount.json');
+
+		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);
+	}
+
+	/**
+	 * Write the user config, to simulate existing files
+	 */
+	private function writeUserConfig($config) {
+		$configFile = $this->userHome . '/mount.json';
+		file_put_contents($configFile, json_encode($config));
+	}
+
 	/**
 	 * Test mount point validation
 	 */
@@ -42,35 +126,518 @@ 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_USER;
+		$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';
-		$applicable = 'test';
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
+		$applicable = self::TEST_USER1;
 		$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]['/' . self::TEST_USER1 . '/files/ext']));
+		$this->assertEquals(
+			'\OC\Files\Storage\SFTP',
+			$config[$mountType][$applicable]['/' . self::TEST_USER1 . '/files/ext']['class']
+		);
+	}
+
+	/**
+	 * Test adding a personal mount point using disallowed backend
+	 */
+	public function testAddDisallowedBackendMountPointSingleUser() {
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
+		$applicable = self::TEST_USER1;
+		$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() {
+		$storageClass = 'Unexist_Storage';
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
+		$applicable = self::TEST_USER1;
+		$isPersonal = false;
+		$this->assertFalse(OC_Mount_Config::addMountPoint('/ext', $storageClass, array(), $mountType, $applicable, $isPersonal));
 
 	}
 
-	public function testAddMountPointUnexistClass() {
-		\OC_User::setUserId('test');
-		$storageClass = 'Unexist_Storage';
-		$mountType = 'user';
-		$applicable = 'test';
-		$isPersonal = true;
-		// local
-		// non-local
-		$this->assertEquals(false, OC_Mount_Config::addMountPoint('/ext', $storageClass, array(), $mountType, $applicable, $isPersonal));
+	/**
+	 * Provider for testing configurations with different
+	 * "applicable" values (all, user, groups)
+	 */
+	public function applicableConfigProvider() {
+		return array(
+			// applicable to "all"
+			array(
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				'all',
+				array(
+					'users' => array('all'),
+					'groups' => array()
+				)
+			),
+			// applicable to single user
+			array(
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				self::TEST_USER1,
+				array(
+					'users' => array(self::TEST_USER1),
+					'groups' => array()
+				)
+			),
+			// applicable to single group
+			array(
+				OC_Mount_Config::MOUNT_TYPE_GROUP,
+				self::TEST_GROUP1,
+				array(
+					'users' => array(),
+					'groups' => array(self::TEST_GROUP1)
+				)
+			),
+		);
+	}
 
+	/**
+	 * Test reading and writing global config
+	 *
+	 * @dataProvider applicableConfigProvider
+	 */
+	public function testReadWriteGlobalConfig($mountType, $applicable, $expectApplicableArray) {
+		$mountType = $mountType;
+		$applicable = $applicable;
+		$isPersonal = false;
+		$options = array(
+			'host' => 'smbhost',
+			'user' => 'smbuser',
+			'password' => 'smbpassword',
+			'share' => 'smbshare',
+			'root' => 'smbroot'
+		);
+
+		// write config
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$options,
+				$mountType,
+				$applicable,
+				$isPersonal
+			)
+		);
+
+		// re-read config
+		$config = OC_Mount_Config::getSystemMountPoints();
+		$this->assertEquals(1, count($config));
+		$this->assertEquals('\OC\Files\Storage\SMB', $config[0]['class']);
+		$this->assertEquals('ext', $config[0]['mountpoint']);
+		$this->assertEquals($expectApplicableArray, $config[0]['applicable']);
+		$savedOptions = $config[0]['options'];
+		$this->assertEquals($options, $savedOptions);
+		// key order needs to be preserved for the UI...
+		$this->assertEquals(array_keys($options), array_keys($savedOptions));
+	}
+
+	/**
+	 * Test reading and writing config
+	 */
+	public function testReadWritePersonalConfig() {
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
+		$applicable = self::TEST_USER1;
+		$isPersonal = true;
+		$options = array(
+			'host' => 'smbhost',
+			'user' => 'smbuser',
+			'password' => 'smbpassword',
+			'share' => 'smbshare',
+			'root' => 'smbroot'
+		);
+
+		// write config
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$options,
+				$mountType,
+				$applicable,
+				$isPersonal
+			)
+		);
+
+		// re-read config
+		$config = OC_Mount_Config::getPersonalMountPoints();
+		$this->assertEquals(1, count($config));
+		$this->assertEquals('\OC\Files\Storage\SMB', $config[0]['class']);
+		$this->assertEquals('ext', $config[0]['mountpoint']);
+		$savedOptions = $config[0]['options'];
+		$this->assertEquals($options, $savedOptions);
+		// key order needs to be preserved for the UI...
+		$this->assertEquals(array_keys($options), array_keys($savedOptions));
+	}
+
+	/**
+	 * Test password obfuscation
+	 */
+	public function testPasswordObfuscation() {
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
+		$applicable = self::TEST_USER1;
+		$isPersonal = true;
+		$mountConfig = array(
+			'host' => 'smbhost',
+			'user' => 'smbuser',
+			'password' => 'smbpassword',
+			'share' => 'smbshare',
+			'root' => 'smbroot'
+		);
+
+		// write config
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$mountConfig,
+				$mountType,
+				$applicable,
+				$isPersonal
+			)
+		);
+
+		// note: password re-reading is covered by testReadWritePersonalConfig
+
+		// check that password inside the file is NOT in plain text
+		$config = $this->readUserConfig();
+		$savedConfig = $config[$mountType][$applicable]['/' . self::TEST_USER1 . '/files/ext']['options'];
+
+		// no more clear text password in file (kept because of key order)
+		$this->assertEquals('', $savedConfig['password']);
+
+		// encrypted password is present
+		$this->assertNotEquals($mountConfig['password'], $savedConfig['password_encrypted']);
+	}
+
+	/**
+	 * Test read legacy passwords
+	 */
+	public function testReadLegacyPassword() {
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
+		$applicable = self::TEST_USER1;
+		$isPersonal = true;
+		$mountConfig = array(
+			'host' => 'smbhost',
+			'user' => 'smbuser',
+			'password' => 'smbpassword',
+			'share' => 'smbshare',
+			'root' => 'smbroot'
+		);
+
+		// write config
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$mountConfig,
+				$mountType,
+				$applicable,
+				$isPersonal
+			)
+		);
+
+		$config = $this->readUserConfig();
+		// simulate non-encrypted password situation
+		$config[$mountType][$applicable]['/' . self::TEST_USER1 . '/files/ext']['options']['password'] = 'smbpasswd';
+
+		$this->writeUserConfig($config);
+
+		// re-read config, password was read correctly
+		$config = OC_Mount_Config::getPersonalMountPoints();
+		$savedMountConfig = $config[0]['options'];
+		$this->assertEquals($mountConfig, $savedMountConfig);
+	}
+
+	public function mountDataProvider() {
+		return array(
+			// Tests for visible mount points
+			// system mount point for all users
+			array(
+				false,
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				'all',
+				self::TEST_USER1,
+				true,
+			),
+			// system mount point for a specific user
+			array(
+				false,
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				self::TEST_USER1,
+				self::TEST_USER1,
+				true,
+			),
+			// system mount point for a specific group
+			array(
+				false,
+				OC_Mount_Config::MOUNT_TYPE_GROUP,
+				self::TEST_GROUP1,
+				self::TEST_USER1,
+				true,
+			),
+			// user mount point
+			array(
+				true,
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				self::TEST_USER1,
+				self::TEST_USER1,
+				true,
+			),
+
+			// Tests for non-visible mount points
+			// system mount point for another user
+			array(
+				false,
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				self::TEST_USER2,
+				self::TEST_USER1,
+				false,
+			),
+			// system mount point for a specific group
+			array(
+				false,
+				OC_Mount_Config::MOUNT_TYPE_GROUP,
+				self::TEST_GROUP2,
+				self::TEST_USER1,
+				false,
+			),
+			// user mount point
+			array(
+				true,
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				self::TEST_USER1,
+				self::TEST_USER2,
+				false,
+			),
+		);
+	}
+
+	/**
+	 * Test mount points used at mount time, making sure
+	 * the configuration is prepared properly.
+	 *
+	 * @dataProvider mountDataProvider
+	 * @param bool $isPersonal true for personal mount point, false for system mount point
+	 * @param string $mountType mount type
+	 * @param string $applicable target user/group or "all"
+	 * @param string $testUser user for which to retrieve the mount points
+	 * @param bool $expectVisible whether to expect the mount point to be visible for $testUser
+	 */
+	public function testMount($isPersonal, $mountType, $applicable, $testUser, $expectVisible) {
+		$mountConfig = array(
+			'host' => 'someost',
+			'user' => 'someuser',
+			'password' => 'somepassword',
+			'root' => 'someroot'
+		);
+
+		// add mount point as "test" user 
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$mountConfig,
+				$mountType,
+				$applicable,
+				$isPersonal
+			)
+		);
+
+		// check mount points in the perspective of user $testUser
+		\OC_User::setUserId($testUser);
+
+		$mountPoints = OC_Mount_Config::getAbsoluteMountPoints($testUser);
+		if ($expectVisible) {
+			$this->assertEquals(1, count($mountPoints));
+			$this->assertTrue(isset($mountPoints['/' . self::TEST_USER1 . '/files/ext']));
+			$this->assertEquals('\OC\Files\Storage\SMB', $mountPoints['/' . self::TEST_USER1 . '/files/ext']['class']);
+			$this->assertEquals($mountConfig, $mountPoints['/' . self::TEST_USER1 . '/files/ext']['options']);
+		}
+		else {
+			$this->assertEquals(0, count($mountPoints));
+		}
+	}
+
+	/**
+	 * Test the same config for multiple users.
+	 * The config will be merged by getSystemMountPoints().
+	 */
+	public function testConfigMerging() {
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
+		$isPersonal = false;
+		$options = array(
+			'host' => 'smbhost',
+			'user' => 'smbuser',
+			'password' => 'smbpassword',
+			'share' => 'smbshare',
+			'root' => 'smbroot'
+		);
+
+		// write config
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$options,
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				self::TEST_USER1,
+				$isPersonal
+			)
+		);
+
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$options,
+				OC_Mount_Config::MOUNT_TYPE_USER,
+				self::TEST_USER2,
+				$isPersonal
+			)
+		);
+
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$options,
+				OC_Mount_Config::MOUNT_TYPE_GROUP,
+				self::TEST_GROUP2,
+				$isPersonal
+			)
+		);
+
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$options,
+				OC_Mount_Config::MOUNT_TYPE_GROUP,
+				self::TEST_GROUP1,
+				$isPersonal
+			)
+		);
+
+		// re-read config
+		$config = OC_Mount_Config::getSystemMountPoints();
+		$this->assertEquals(1, count($config));
+		$this->assertEquals('\OC\Files\Storage\SMB', $config[0]['class']);
+		$this->assertEquals('ext', $config[0]['mountpoint']);
+		$this->assertEquals($options, $config[0]['options']);
+		$this->assertEquals(array(self::TEST_USER1, self::TEST_USER2), $config[0]['applicable']['users']);
+		$this->assertEquals(array(self::TEST_GROUP2, self::TEST_GROUP1), $config[0]['applicable']['groups']);
+	}
+
+	/**
+	 * Create then re-read mount points configs where the mount points
+	 * have the same path, the config must NOT be merged.
+	 */
+	public function testRereadMountpointWithSamePath() {
+		$mountType = OC_Mount_Config::MOUNT_TYPE_USER;
+		$isPersonal = false;
+		$options1 = array(
+			'host' => 'smbhost',
+			'user' => 'smbuser',
+			'password' => 'smbpassword',
+			'share' => 'smbshare',
+			'root' => 'smbroot'
+		);
+
+		// write config
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$options1,
+				$mountType,
+				self::TEST_USER1,
+				$isPersonal
+			)
+		);
+
+		$options2 = array(
+			'host' => 'anothersmbhost',
+			'user' => 'anothersmbuser',
+			'password' => 'anothersmbpassword',
+			'share' => 'anothersmbshare',
+			'root' => 'anothersmbroot'
+		);
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				'/ext',
+				'\OC\Files\Storage\SMB',
+				$options2,
+				$mountType,
+				self::TEST_USER2,
+				$isPersonal
+			)
+		);
+
+		// re-read config
+		$config = OC_Mount_Config::getSystemMountPoints();
+		$this->assertEquals(2, count($config));
+		$this->assertEquals('\OC\Files\Storage\SMB', $config[0]['class']);
+		$this->assertEquals('ext', $config[0]['mountpoint']);
+		$this->assertEquals($options1, $config[0]['options']);
+		$this->assertEquals('\OC\Files\Storage\SMB', $config[1]['class']);
+		$this->assertEquals('ext', $config[1]['mountpoint']);
+		$this->assertEquals($options2, $config[1]['options']);
 	}
 }
diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index 3469829b6f..06e454b7d7 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -1,4 +1,5 @@
 <?php
+/** @var $this \OCP\Route\IRouter */
 $this->create('core_ajax_public_preview', '/publicpreview.png')->action(
 function() {
 	require_once __DIR__ . '/../ajax/publicpreview.php';
diff --git a/apps/files_sharing/css/mobile.css b/apps/files_sharing/css/mobile.css
index 7d2116d190..333c4c77fc 100644
--- a/apps/files_sharing/css/mobile.css
+++ b/apps/files_sharing/css/mobile.css
@@ -1,4 +1,4 @@
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 768px) {
 
 /* make header scroll up for single shares, more view of content on small screens */
 #header.share-file {
@@ -45,5 +45,13 @@ table td.filename .nametext {
 	display: none;
 }
 
+/* ellipsis on file names */
+.nametext {
+	width: 60%;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 
 }
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 36de452a55..9f0ed12f93 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -5,6 +5,14 @@ $(document).ready(function() {
 
 	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined'  && !disableSharing) {
 		$('#fileList').on('fileActionsReady',function(){
+
+			var allShared = $('#fileList').find('[data-share-owner]').find('[data-Action="Share"]');
+			allShared.addClass('permanent');
+			allShared.find('span').text(function(){
+				$owner = $(this).closest('tr').attr('data-share-owner');
+				return ' ' + t('files_sharing', 'Shared by {owner}', {owner: $owner});
+			});
+
 			if (!sharesLoaded){
 				OC.Share.loadIcons('file');
 				// assume that we got all shares, so switching directories
@@ -17,16 +25,15 @@ $(document).ready(function() {
 		});
 
 		FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
-			if ($('#dir').val() == '/') {
-				var item = $('#dir').val() + filename;
-			} else {
-				var item = $('#dir').val() + '/' + filename;
+			var dir = $('#dir').val();
+			var item = dir + '/' + filename;
+			if (dir == '/') {
+				item = dir + filename;
 			}
 			var tr = FileList.findFileEl(filename);
+			var itemType = 'file';
 			if ($(tr).data('type') == 'dir') {
-				var itemType = 'folder';
-			} else {
-				var itemType = 'file';
+				itemType = 'folder';
 			}
 			var possiblePermissions = $(tr).data('permissions');
 			var appendTo = $(tr).find('td.filename');
diff --git a/apps/files_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
index 2625af1cc0..f796f7ec59 100644
--- a/apps/files_sharing/l10n/ar.php
+++ b/apps/files_sharing/l10n/ar.php
@@ -1,11 +1,17 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "مشاركة من طرف {owner}",
+"This share is password-protected" => "هذه المشاركة محمية بكلمة مرور",
+"The password is wrong. Try again." => "كلمة المرور خاطئة. حاول مرة أخرى",
 "Password" => "كلمة المرور",
-"%s shared the folder %s with you" => "%s شارك المجلد %s معك",
-"%s shared the file %s with you" => "%s شارك الملف %s معك",
-"Download" => "تحميل",
-"Upload" => "رفع",
-"Cancel upload" => "إلغاء رفع الملفات",
-"No preview available for" => "لا يوجد عرض مسبق لـ"
+"Sorry, this link doesn’t seem to work anymore." => "عذرا، يبدو أن هذا الرابط لم يعد يعمل.",
+"Reasons might be:" => "الأسباب الممكنة :",
+"the item was removed" => "تم حذف العنصر المطلوب",
+"the link expired" => "انتهت صلاحية الرابط",
+"sharing is disabled" => "المشاركة غير مفعلة",
+"For more info, please ask the person who sent this link." => "لمزيد من المعلومات، يرجى سؤال الشخص الذي أرسل هذا الرابط",
+"shared by %s" => "مشاركة من قبل %s",
+"Download %s" => "تحميل %s",
+"Direct link" => "رابط مباشر"
 );
 $PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php
index f4b9e2dd5f..4fe5ba6b16 100644
--- a/apps/files_sharing/l10n/bg_BG.php
+++ b/apps/files_sharing/l10n/bg_BG.php
@@ -1,11 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Парола",
-"%s shared the folder %s with you" => "%s сподели папката %s с Вас",
-"%s shared the file %s with you" => "%s сподели файла %s с Вас",
-"Download" => "Изтегляне",
-"Upload" => "Качване",
-"Cancel upload" => "Спри качването",
-"No preview available for" => "Няма наличен преглед за"
+"Password" => "Парола"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
index aaed904d9d..1d737247d8 100644
--- a/apps/files_sharing/l10n/bn_BD.php
+++ b/apps/files_sharing/l10n/bn_BD.php
@@ -1,11 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "কূটশব্দ",
-"%s shared the folder %s with you" => "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন",
-"%s shared the file %s with you" => "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন",
-"Download" => "ডাউনলোড",
-"Upload" => "আপলোড",
-"Cancel upload" => "আপলোড বাতিল কর",
-"No preview available for" => "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
+"Password" => "কূটশব্দ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 96e5999296..6432219650 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Compartits per {owner}",
 "This share is password-protected" => "Aquest compartit està protegit amb contrasenya",
 "The password is wrong. Try again." => "la contrasenya és incorrecta. Intenteu-ho de nou.",
 "Password" => "Contrasenya",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "l'enllaç ha vençut",
 "sharing is disabled" => "s'ha desactivat la compartició",
 "For more info, please ask the person who sent this link." => "Per més informació contacteu amb qui us ha enviat l'enllaç.",
-"%s shared the folder %s with you" => "%s ha compartit la carpeta %s amb vós",
-"%s shared the file %s with you" => "%s ha compartit el fitxer %s amb vós",
-"Download" => "Baixa",
-"Upload" => "Puja",
-"Cancel upload" => "Cancel·la la pujada",
-"No preview available for" => "No hi ha vista prèvia disponible per a",
+"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 adf099a6d9..e7a8b16f00 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Sdílí {owner}",
 "This share is password-protected" => "Toto sdílení je chráněno heslem",
 "The password is wrong. Try again." => "Heslo není správné. Zkuste to znovu.",
 "Password" => "Heslo",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "platnost odkazu vypršela",
 "sharing is disabled" => "sdílení je zakázané",
 "For more info, please ask the person who sent this link." => "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.",
-"%s shared the folder %s with you" => "%s s Vámi sdílí složku %s",
-"%s shared the file %s with you" => "%s s Vámi sdílí soubor %s",
-"Download" => "Stáhnout",
-"Upload" => "Odeslat",
-"Cancel upload" => "Zrušit odesílání",
-"No preview available for" => "Náhled není dostupný pro",
+"shared by %s" => "sdílí %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/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
index d2ae28141d..bf05f890a9 100644
--- a/apps/files_sharing/l10n/cy_GB.php
+++ b/apps/files_sharing/l10n/cy_GB.php
@@ -1,11 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Cyfrinair",
-"%s shared the folder %s with you" => "Rhannodd %s blygell %s â chi",
-"%s shared the file %s with you" => "Rhannodd %s ffeil %s â chi",
-"Download" => "Llwytho i lawr",
-"Upload" => "Llwytho i fyny",
-"Cancel upload" => "Diddymu llwytho i fyny",
-"No preview available for" => "Does dim rhagolwg ar gael ar gyfer"
+"Password" => "Cyfrinair"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
index 849b0e28d3..6c6a39c295 100644
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Delt af {owner}",
 "This share is password-protected" => "Delingen er beskyttet af kodeord",
 "The password is wrong. Try again." => "Kodeordet er forkert. Prøv igen.",
 "Password" => "Kodeord",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "linket udløb",
 "sharing is disabled" => "deling er deaktiveret",
 "For more info, please ask the person who sent this link." => "For yderligere information, kontakt venligst personen der sendte linket. ",
-"%s shared the folder %s with you" => "%s delte mappen %s med dig",
-"%s shared the file %s with you" => "%s delte filen %s med dig",
-"Download" => "Download",
-"Upload" => "Upload",
-"Cancel upload" => "Fortryd upload",
-"No preview available for" => "Forhåndsvisning ikke tilgængelig for",
+"shared by %s" => "delt af %s",
+"Download %s" => "Download %s",
 "Direct link" => "Direkte link"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index d7879833ca..a924881844 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Geteilt von {owner}",
 "This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
 "The password is wrong. Try again." => "Bitte überprüfe Dein Passwort und versuche es erneut.",
 "Password" => "Passwort",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "Der Link ist abgelaufen",
 "sharing is disabled" => "Teilen ist deaktiviert",
 "For more info, please ask the person who sent this link." => "Für mehr Informationen, frage bitte die Person, die Dir diesen Link geschickt hat.",
-"%s shared the folder %s with you" => "%s hat den Ordner %s mit Dir geteilt",
-"%s shared the file %s with you" => "%s hat die Datei %s mit Dir geteilt",
-"Download" => "Download",
-"Upload" => "Upload",
-"Cancel upload" => "Upload abbrechen",
-"No preview available for" => "Es ist keine Vorschau verfügbar für",
+"shared by %s" => "Freigegeben von %s",
+"Download %s" => "Download %s",
 "Direct link" => "Direkter Link"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_AT.php b/apps/files_sharing/l10n/de_AT.php
new file mode 100644
index 0000000000..142892bc9a
--- /dev/null
+++ b/apps/files_sharing/l10n/de_AT.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Password" => "Passwort"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_CH.php b/apps/files_sharing/l10n/de_CH.php
index f63714b902..6ea0a4654c 100644
--- a/apps/files_sharing/l10n/de_CH.php
+++ b/apps/files_sharing/l10n/de_CH.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Geteilt von {owner}",
 "The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
 "Password" => "Passwort",
 "Sorry, this link doesn’t seem to work anymore." => "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
@@ -7,12 +8,6 @@ $TRANSLATIONS = array(
 "the item was removed" => "Das Element wurde entfernt",
 "the link expired" => "Der Link ist abgelaufen",
 "sharing is disabled" => "Teilen ist deaktiviert",
-"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
-"%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt",
-"%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt",
-"Download" => "Herunterladen",
-"Upload" => "Hochladen",
-"Cancel upload" => "Upload abbrechen",
-"No preview available for" => "Es ist keine Vorschau verfügbar für"
+"For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
index 3ab95b6690..e7bd75a2e0 100644
--- a/apps/files_sharing/l10n/de_DE.php
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Geteilt von {owner}",
 "This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
 "The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
 "Password" => "Passwort",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "Der Link ist abgelaufen",
 "sharing is disabled" => "Teilen ist deaktiviert",
 "For more info, please ask the person who sent this link." => "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
-"%s shared the folder %s with you" => "%s hat den Ordner %s mit Ihnen geteilt",
-"%s shared the file %s with you" => "%s hat die Datei %s mit Ihnen geteilt",
-"Download" => "Herunterladen",
-"Upload" => "Hochladen",
-"Cancel upload" => "Upload abbrechen",
-"No preview available for" => "Es ist keine Vorschau verfügbar für",
+"shared by %s" => "Geteilt von %s",
+"Download %s" => "Download %s",
 "Direct link" => "Direkte Verlinkung"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index 3ea666504b..10ff594c98 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Διαμοιράστηκε από τον {owner}",
 "This share is password-protected" => "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
 "The password is wrong. Try again." => "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.",
 "Password" => "Κωδικός πρόσβασης",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "ο σύνδεσμος έληξε",
 "sharing is disabled" => "ο διαμοιρασμός απενεργοποιήθηκε",
 "For more info, please ask the person who sent this link." => "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο.",
-"%s shared the folder %s with you" => "Ο %s μοιράστηκε τον φάκελο %s μαζί σας",
-"%s shared the file %s with you" => "Ο %s μοιράστηκε το αρχείο %s μαζί σας",
-"Download" => "Λήψη",
-"Upload" => "Μεταφόρτωση",
-"Cancel upload" => "Ακύρωση μεταφόρτωσης",
-"No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για",
+"shared by %s" => "διαμοιράστηκε από %s",
+"Download %s" => "Λήψη %s",
 "Direct link" => "Άμεσος σύνδεσμος"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
index cd3c00d29d..ab628e1717 100644
--- a/apps/files_sharing/l10n/en@pirate.php
+++ b/apps/files_sharing/l10n/en@pirate.php
@@ -1,9 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Secret Code",
-"%s shared the folder %s with you" => "%s shared the folder %s with you",
-"%s shared the file %s with you" => "%s shared the file %s with you",
-"Download" => "Download",
-"No preview available for" => "No preview available for"
+"Password" => "Secret Code"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/en_GB.php b/apps/files_sharing/l10n/en_GB.php
index 3e04d120be..02663f96b8 100644
--- a/apps/files_sharing/l10n/en_GB.php
+++ b/apps/files_sharing/l10n/en_GB.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Shared by {owner}",
 "This share is password-protected" => "This share is password-protected",
 "The password is wrong. Try again." => "The password is wrong. Try again.",
 "Password" => "Password",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "the link expired",
 "sharing is disabled" => "sharing is disabled",
 "For more info, please ask the person who sent this link." => "For more info, please ask the person who sent this link.",
-"%s shared the folder %s with you" => "%s shared the folder %s with you",
-"%s shared the file %s with you" => "%s shared the file %s with you",
-"Download" => "Download",
-"Upload" => "Upload",
-"Cancel upload" => "Cancel upload",
-"No preview available for" => "No preview available for",
+"shared by %s" => "shared by %s",
+"Download %s" => "Download %s",
 "Direct link" => "Direct link"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index 891b3db9aa..1148d51697 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Kunhavigita de {owner}",
 "This share is password-protected" => "Ĉi tiu kunhavigo estas protektata per pasvorto",
 "Password" => "Pasvorto",
 "Sorry, this link doesn’t seem to work anymore." => "Pardonu, ĉi tiu ligilo ŝajne ne plu funkcias.",
@@ -8,12 +9,6 @@ $TRANSLATIONS = array(
 "the link expired" => "la ligilo eksvalidiĝis",
 "sharing is disabled" => "kunhavigo malkapablas",
 "For more info, please ask the person who sent this link." => "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon.",
-"%s shared the folder %s with you" => "%s kunhavigis la dosierujon %s kun vi",
-"%s shared the file %s with you" => "%s kunhavigis la dosieron %s kun vi",
-"Download" => "Elŝuti",
-"Upload" => "Alŝuti",
-"Cancel upload" => "Nuligi alŝuton",
-"No preview available for" => "Ne haveblas antaŭvido por",
 "Direct link" => "Direkta ligilo"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index f986c29b4f..2e3f3b8500 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Compartido por {owner}",
 "This share is password-protected" => "Este elemento compartido esta protegido por contraseña",
 "The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
 "Password" => "Contraseña",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "el enlace expiró",
 "sharing is disabled" => "compartir está desactivado",
 "For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.",
-"%s shared the folder %s with you" => "%s compartió la carpeta %s contigo",
-"%s shared the file %s with you" => "%s compartió el fichero %s contigo",
-"Download" => "Descargar",
-"Upload" => "Subir",
-"Cancel upload" => "Cancelar subida",
-"No preview available for" => "No hay vista previa disponible para",
+"shared by %s" => "Compartido por %s",
+"Download %s" => "Descargar %s",
 "Direct link" => "Enlace directo"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
index 989a91a450..95cfadc1db 100644
--- a/apps/files_sharing/l10n/es_AR.php
+++ b/apps/files_sharing/l10n/es_AR.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Compartido por {owner}",
+"This share is password-protected" => "Esto está protegido por contraseña",
 "The password is wrong. Try again." => "La contraseña no es correcta. Probá de nuevo.",
 "Password" => "Contraseña",
 "Sorry, this link doesn’t seem to work anymore." => "Perdón, este enlace parece no funcionar más.",
@@ -8,11 +10,6 @@ $TRANSLATIONS = array(
 "the link expired" => "el enlace expiró",
 "sharing is disabled" => "compartir está desactivado",
 "For more info, please ask the person who sent this link." => "Para mayor información, contactá a la persona que te mandó el enlace.",
-"%s shared the folder %s with you" => "%s compartió la carpeta %s con vos",
-"%s shared the file %s with you" => "%s compartió el archivo %s con vos",
-"Download" => "Descargar",
-"Upload" => "Subir",
-"Cancel upload" => "Cancelar subida",
-"No preview available for" => "La vista preliminar no está disponible para"
+"Direct link" => "Vínculo directo"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_CL.php b/apps/files_sharing/l10n/es_CL.php
index 31dc045870..42a2f066c6 100644
--- a/apps/files_sharing/l10n/es_CL.php
+++ b/apps/files_sharing/l10n/es_CL.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Clave",
-"Upload" => "Subir"
+"Password" => "Clave"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_MX.php b/apps/files_sharing/l10n/es_MX.php
index 9100ef8b35..9168e25308 100644
--- a/apps/files_sharing/l10n/es_MX.php
+++ b/apps/files_sharing/l10n/es_MX.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Compartido por {owner}",
 "This share is password-protected" => "Este elemento compartido esta protegido por contraseña",
 "The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
 "Password" => "Contraseña",
@@ -9,12 +10,6 @@ $TRANSLATIONS = array(
 "the link expired" => "el enlace expiró",
 "sharing is disabled" => "compartir está desactivado",
 "For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.",
-"%s shared the folder %s with you" => "%s compartió la carpeta %s contigo",
-"%s shared the file %s with you" => "%s compartió el archivo %s contigo",
-"Download" => "Descargar",
-"Upload" => "Subir",
-"Cancel upload" => "Cancelar subida",
-"No preview available for" => "No hay vista previa disponible para",
 "Direct link" => "Enlace directo"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index 4b7f975e83..af5891fcc7 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Jagas {owner}",
 "This share is password-protected" => "See jagamine on parooliga kaitstud",
 "The password is wrong. Try again." => "Parool on vale. Proovi uuesti.",
 "Password" => "Parool",
@@ -9,12 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "link on aegunud",
 "sharing is disabled" => "jagamine on peatatud",
 "For more info, please ask the person who sent this link." => "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole.",
-"%s shared the folder %s with you" => "%s jagas sinuga kausta %s",
-"%s shared the file %s with you" => "%s jagas sinuga faili %s",
-"Download" => "Lae alla",
-"Upload" => "Lae üles",
-"Cancel upload" => "Tühista üleslaadimine",
-"No preview available for" => "Eelvaadet pole saadaval",
+"shared by %s" => "jagas %s",
 "Direct link" => "Otsene link"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 20de5a085a..5f13a73e1f 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "{owner}-k partekatuta",
 "This share is password-protected" => "Elkarbanatutako hau pasahitzarekin babestuta dago",
 "The password is wrong. Try again." => "Pasahitza ez da egokia. Saiatu berriro.",
 "Password" => "Pasahitza",
@@ -9,12 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "lotura iraungi da",
 "sharing is disabled" => "elkarbanatzea ez dago gaituta",
 "For more info, please ask the person who sent this link." => "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari",
-"%s shared the folder %s with you" => "%sk zurekin %s karpeta elkarbanatu du",
-"%s shared the file %s with you" => "%sk zurekin %s fitxategia elkarbanatu du",
-"Download" => "Deskargatu",
-"Upload" => "Igo",
-"Cancel upload" => "Ezeztatu igoera",
-"No preview available for" => "Ez dago aurrebista eskuragarririk hauentzat ",
+"shared by %s" => "%sk partekatuta",
 "Direct link" => "Lotura zuzena"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
index 664338723c..9b0a1dbc9d 100644
--- a/apps/files_sharing/l10n/fa.php
+++ b/apps/files_sharing/l10n/fa.php
@@ -1,12 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "اشتراک گذارنده {owner}",
 "The password is wrong. Try again." => "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
-"Password" => "گذرواژه",
-"%s shared the folder %s with you" => "%sپوشه %s را با شما به اشتراک گذاشت",
-"%s shared the file %s with you" => "%sفایل %s را با شما به اشتراک گذاشت",
-"Download" => "دانلود",
-"Upload" => "بارگزاری",
-"Cancel upload" => "متوقف کردن بار گذاری",
-"No preview available for" => "هیچگونه پیش نمایشی موجود نیست"
+"Password" => "گذرواژه"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index c54c822b1c..e8ca368c71 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Jakanut {owner}",
 "This share is password-protected" => "Tämä jako on suojattu salasanalla",
 "The password is wrong. Try again." => "Väärä salasana. Yritä uudelleen.",
 "Password" => "Salasana",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "linkki vanheni",
 "sharing is disabled" => "jakaminen on poistettu käytöstä",
 "For more info, please ask the person who sent this link." => "Kysy lisätietoja henkilöltä, jolta sait linkin.",
-"%s shared the folder %s with you" => "%s jakoi kansion %s kanssasi",
-"%s shared the file %s with you" => "%s jakoi tiedoston %s kanssasi",
-"Download" => "Lataa",
-"Upload" => "Lähetä",
-"Cancel upload" => "Peru lähetys",
-"No preview available for" => "Ei esikatselua kohteelle",
+"shared by %s" => "jakanut %s",
+"Download %s" => "Lataa %s",
 "Direct link" => "Suora linkki"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index b51f421fa5..8e083f4ca0 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Partagé par {owner}",
 "This share is password-protected" => "Ce partage est protégé par un mot de passe",
 "The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez réessayer.",
 "Password" => "Mot de passe",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "le lien a expiré",
 "sharing is disabled" => "le partage est désactivé",
 "For more info, please ask the person who sent this link." => "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.",
-"%s shared the folder %s with you" => "%s a partagé le répertoire %s avec vous",
-"%s shared the file %s with you" => "%s a partagé le fichier %s avec vous",
-"Download" => "Télécharger",
-"Upload" => "Envoyer",
-"Cancel upload" => "Annuler l'envoi",
-"No preview available for" => "Pas d'aperçu disponible pour",
+"shared by %s" => "partagé par %s",
+"Download %s" => "Télécharger %s",
 "Direct link" => "Lien direct"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
index 3ea3fe5f1c..a04e823423 100644
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Compartido por {owner}",
 "This share is password-protected" => "Esta compartición está protexida con contrasinal",
 "The password is wrong. Try again." => "O contrasinal é incorrecto. Ténteo de novo.",
 "Password" => "Contrasinal",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "a ligazón caducou",
 "sharing is disabled" => "foi desactivada a compartición",
 "For more info, please ask the person who sent this link." => "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.",
-"%s shared the folder %s with you" => "%s compartiu o cartafol %s con vostede",
-"%s shared the file %s with you" => "%s compartiu o ficheiro %s con vostede",
-"Download" => "Descargar",
-"Upload" => "Enviar",
-"Cancel upload" => "Cancelar o envío",
-"No preview available for" => "Sen vista previa dispoñíbel para",
+"shared by %s" => "compartido por %s",
+"Download %s" => "Descargar %s",
 "Direct link" => "Ligazón directa"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
index 217298fedd..9ba86d0772 100644
--- a/apps/files_sharing/l10n/he.php
+++ b/apps/files_sharing/l10n/he.php
@@ -1,11 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "סיסמא",
-"%s shared the folder %s with you" => "%s שיתף עמך את התיקייה %s",
-"%s shared the file %s with you" => "%s שיתף עמך את הקובץ %s",
-"Download" => "הורדה",
-"Upload" => "העלאה",
-"Cancel upload" => "ביטול ההעלאה",
-"No preview available for" => "אין תצוגה מקדימה זמינה עבור"
+"Shared by {owner}" => "שותף בידי {owner}",
+"Password" => "סיסמא"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php
index 63a5d528f3..74a2c32043 100644
--- a/apps/files_sharing/l10n/hi.php
+++ b/apps/files_sharing/l10n/hi.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "पासवर्ड",
-"Upload" => "अपलोड "
+"Password" => "पासवर्ड"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
index 4a82dd7f71..60c01d30b5 100644
--- a/apps/files_sharing/l10n/hr.php
+++ b/apps/files_sharing/l10n/hr.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Lozinka",
-"Download" => "Preuzimanje",
-"Upload" => "Učitaj",
-"Cancel upload" => "Prekini upload"
+"Password" => "Lozinka"
 );
 $PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
index a06c51b377..787a22fe6c 100644
--- a/apps/files_sharing/l10n/hu_HU.php
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Megosztotta: {owner}",
 "This share is password-protected" => "Ez egy jelszóval védett megosztás",
 "The password is wrong. Try again." => "A megadott jelszó nem megfelelő. Próbálja újra!",
 "Password" => "Jelszó",
@@ -9,12 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "lejárt a link érvényességi ideje",
 "sharing is disabled" => "letiltásra került a megosztás",
 "For more info, please ask the person who sent this link." => "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!",
-"%s shared the folder %s with you" => "%s megosztotta Önnel ezt a mappát: %s",
-"%s shared the file %s with you" => "%s megosztotta Önnel ezt az állományt: %s",
-"Download" => "Letöltés",
-"Upload" => "Feltöltés",
-"Cancel upload" => "A feltöltés megszakítása",
-"No preview available for" => "Nem áll rendelkezésre előnézet ehhez: ",
+"shared by %s" => "Megosztotta: %s",
 "Direct link" => "Közvetlen link"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
index f9d6c33a0b..9ec82f20df 100644
--- a/apps/files_sharing/l10n/ia.php
+++ b/apps/files_sharing/l10n/ia.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Contrasigno",
-"Download" => "Discargar",
-"Upload" => "Incargar"
+"Password" => "Contrasigno"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
index 865a951c2d..e4668a7fb5 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Dibagikan oleh {owner}",
 "This share is password-protected" => "Berbagi ini dilindungi sandi",
 "The password is wrong. Try again." => "Sandi salah. Coba lagi",
 "Password" => "Sandi",
@@ -9,12 +10,6 @@ $TRANSLATIONS = array(
 "the link expired" => "tautan telah kadaluarsa",
 "sharing is disabled" => "berbagi dinonaktifkan",
 "For more info, please ask the person who sent this link." => "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini.",
-"%s shared the folder %s with you" => "%s membagikan folder %s dengan Anda",
-"%s shared the file %s with you" => "%s membagikan berkas %s dengan Anda",
-"Download" => "Unduh",
-"Upload" => "Unggah",
-"Cancel upload" => "Batal unggah",
-"No preview available for" => "Tidak ada pratinjau yang tersedia untuk",
 "Direct link" => "Tautan langsung"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php
index 8ae8e48eff..c4a1c58940 100644
--- a/apps/files_sharing/l10n/is.php
+++ b/apps/files_sharing/l10n/is.php
@@ -1,11 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Lykilorð",
-"%s shared the folder %s with you" => "%s deildi möppunni %s með þér",
-"%s shared the file %s with you" => "%s deildi skránni %s með þér",
-"Download" => "Niðurhal",
-"Upload" => "Senda inn",
-"Cancel upload" => "Hætta við innsendingu",
-"No preview available for" => "Yfirlit ekki í boði fyrir"
+"Password" => "Lykilorð"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 7967b50d34..7efa458460 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Condiviso da {owner}",
 "This share is password-protected" => "Questa condivione è protetta da password",
 "The password is wrong. Try again." => "La password è errata. Prova ancora.",
 "Password" => "Password",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "il collegamento è scaduto",
 "sharing is disabled" => "la condivisione è disabilitata",
 "For more info, please ask the person who sent this link." => "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.",
-"%s shared the folder %s with you" => "%s ha condiviso la cartella %s con te",
-"%s shared the file %s with you" => "%s ha condiviso il file %s con te",
-"Download" => "Scarica",
-"Upload" => "Carica",
-"Cancel upload" => "Annulla il caricamento",
-"No preview available for" => "Nessuna anteprima disponibile per",
+"shared by %s" => "condiviso da %s",
+"Download %s" => "Scarica %s",
 "Direct link" => "Collegamento diretto"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ja.php b/apps/files_sharing/l10n/ja.php
new file mode 100644
index 0000000000..7e6461c608
--- /dev/null
+++ b/apps/files_sharing/l10n/ja.php
@@ -0,0 +1,17 @@
+<?php
+$TRANSLATIONS = array(
+"Shared by {owner}" => "{owner} と共有中",
+"This share is password-protected" => "この共有はパスワードで保護されています",
+"The password is wrong. Try again." => "パスワードが間違っています。再試行してください。",
+"Password" => "パスワード",
+"Sorry, this link doesn’t seem to work anymore." => "申し訳ございません。このリンクはもう利用できません。",
+"Reasons might be:" => "理由は以下の通りと考えられます：",
+"the item was removed" => "アイテムが削除されました",
+"the link expired" => "リンクの期限が切れています",
+"sharing is disabled" => "共有が無効になっています",
+"For more info, please ask the person who sent this link." => "不明な点は、こちらのリンクの提供者に確認をお願いします。",
+"shared by %s" => "%s で共有中",
+"Download %s" => "%s をダウンロード",
+"Direct link" => "リンク"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index fe25cb5b6e..7e6461c608 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "{owner} と共有中",
 "This share is password-protected" => "この共有はパスワードで保護されています",
 "The password is wrong. Try again." => "パスワードが間違っています。再試行してください。",
 "Password" => "パスワード",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "リンクの期限が切れています",
 "sharing is disabled" => "共有が無効になっています",
 "For more info, please ask the person who sent this link." => "不明な点は、こちらのリンクの提供者に確認をお願いします。",
-"%s shared the folder %s with you" => "%s はフォルダー %s をあなたと共有中です",
-"%s shared the file %s with you" => "%s はファイル %s をあなたと共有中です",
-"Download" => "ダウンロード",
-"Upload" => "アップロード",
-"Cancel upload" => "アップロードをキャンセル",
-"No preview available for" => "プレビューはありません",
+"shared by %s" => "%s で共有中",
+"Download %s" => "%s をダウンロード",
 "Direct link" => "リンク"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
index 89a6800b3e..5fc48c9fd9 100644
--- a/apps/files_sharing/l10n/ka_GE.php
+++ b/apps/files_sharing/l10n/ka_GE.php
@@ -1,11 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "პაროლი",
-"%s shared the folder %s with you" => "%s–მა გაგიზიარათ ფოლდერი %s",
-"%s shared the file %s with you" => "%s–მა გაგიზიარათ ფაილი %s",
-"Download" => "ჩამოტვირთვა",
-"Upload" => "ატვირთვა",
-"Cancel upload" => "ატვირთვის გაუქმება",
-"No preview available for" => "წინასწარი დათვალიერება შეუძლებელია"
+"Shared by {owner}" => "გაზიარდა {owner} –ის მიერ",
+"Password" => "პაროლი"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/km.php b/apps/files_sharing/l10n/km.php
new file mode 100644
index 0000000000..99b97c914e
--- /dev/null
+++ b/apps/files_sharing/l10n/km.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"Password" => "ពាក្យសម្ងាត់",
+"shared by %s" => "បាន​ចែក​រំលែក​ដោយ %s"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php
index 03c4c1aea9..a4593fbd6c 100644
--- a/apps/files_sharing/l10n/ko.php
+++ b/apps/files_sharing/l10n/ko.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "{owner} 님이 공유함",
 "This share is password-protected" => "이 공유는 암호로 보호되어 있습니다",
 "The password is wrong. Try again." => "암호가 잘못되었습니다. 다시 입력해 주십시오.",
 "Password" => "암호",
@@ -9,12 +10,6 @@ $TRANSLATIONS = array(
 "the link expired" => "링크가 만료됨",
 "sharing is disabled" => "공유가 비활성화됨",
 "For more info, please ask the person who sent this link." => "자세한 정보는 링크를 보낸 사람에게 문의하십시오.",
-"%s shared the folder %s with you" => "%s 님이 폴더 %s을(를) 공유하였습니다",
-"%s shared the file %s with you" => "%s 님이 파일 %s을(를) 공유하였습니다",
-"Download" => "다운로드",
-"Upload" => "업로드",
-"Cancel upload" => "업로드 취소",
-"No preview available for" => "다음 항목을 미리 볼 수 없음:",
 "Direct link" => "직접 링크"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
index 6b4b7e4ba9..d433885e67 100644
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ b/apps/files_sharing/l10n/ku_IQ.php
@@ -1,10 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "وشەی تێپەربو",
-"%s shared the folder %s with you" => "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ",
-"%s shared the file %s with you" => "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ",
-"Download" => "داگرتن",
-"Upload" => "بارکردن",
-"No preview available for" => "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ"
+"Password" => "وشەی تێپەربو"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
index eeb6a3e2dc..b253e795df 100644
--- a/apps/files_sharing/l10n/lb.php
+++ b/apps/files_sharing/l10n/lb.php
@@ -1,12 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
-"Password" => "Passwuert",
-"%s shared the folder %s with you" => "%s huet den Dossier %s mad der gedeelt",
-"%s shared the file %s with you" => "%s deelt den Fichier %s mad dir",
-"Download" => "Download",
-"Upload" => "Eroplueden",
-"Cancel upload" => "Upload ofbriechen",
-"No preview available for" => "Keeng Preview do fir"
+"Password" => "Passwuert"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
index 3786fd08b9..5db5ae275e 100644
--- a/apps/files_sharing/l10n/lt_LT.php
+++ b/apps/files_sharing/l10n/lt_LT.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Bendrina {owner}",
 "This share is password-protected" => "Turinys apsaugotas slaptažodžiu",
 "The password is wrong. Try again." => "Netinka slaptažodis: Bandykite dar kartą.",
 "Password" => "Slaptažodis",
@@ -9,12 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "baigėsi nuorodos galiojimo laikas",
 "sharing is disabled" => "dalinimasis yra išjungtas",
 "For more info, please ask the person who sent this link." => "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą.",
-"%s shared the folder %s with you" => "%s pasidalino su jumis %s aplanku",
-"%s shared the file %s with you" => "%s pasidalino su jumis %s failu",
-"Download" => "Atsisiųsti",
-"Upload" => "Įkelti",
-"Cancel upload" => "Atšaukti siuntimą",
-"No preview available for" => "Peržiūra nėra galima",
+"shared by %s" => "pasidalino %s",
 "Direct link" => "Tiesioginė nuoroda"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
index a913ba1152..834d7c1721 100644
--- a/apps/files_sharing/l10n/lv.php
+++ b/apps/files_sharing/l10n/lv.php
@@ -1,11 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Parole",
-"%s shared the folder %s with you" => "%s ar jums dalījās ar mapi %s",
-"%s shared the file %s with you" => "%s ar jums dalījās ar datni %s",
-"Download" => "Lejupielādēt",
-"Upload" => "Augšupielādēt",
-"Cancel upload" => "Atcelt augšupielādi",
-"No preview available for" => "Nav pieejams priekšskatījums priekš"
+"Shared by {owner}" => "Dalījās {owner}",
+"Password" => "Parole"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
index c132f7aa26..6afa5fc684 100644
--- a/apps/files_sharing/l10n/mk.php
+++ b/apps/files_sharing/l10n/mk.php
@@ -1,11 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Лозинка",
-"%s shared the folder %s with you" => "%s ја сподели папката %s со Вас",
-"%s shared the file %s with you" => "%s ја сподели датотеката %s со Вас",
-"Download" => "Преземи",
-"Upload" => "Подигни",
-"Cancel upload" => "Откажи прикачување",
-"No preview available for" => "Нема достапно преглед за"
+"Shared by {owner}" => "Споделени од {owner}",
+"Password" => "Лозинка"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
index 9725dd4d1b..89d11f49fd 100644
--- a/apps/files_sharing/l10n/ms_MY.php
+++ b/apps/files_sharing/l10n/ms_MY.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Kata laluan",
-"Download" => "Muat turun",
-"Upload" => "Muat naik",
-"Cancel upload" => "Batal muat naik"
+"Password" => "Kata laluan"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
index ff92e898ed..475d642743 100644
--- a/apps/files_sharing/l10n/my_MM.php
+++ b/apps/files_sharing/l10n/my_MM.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "စကားဝှက်",
-"Download" => "ဒေါင်းလုတ်"
+"Password" => "စကားဝှက်"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index 0452b5275c..6427d71670 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -1,12 +1,16 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Delt av {owner}",
+"This share is password-protected" => "Denne delingen er passordbeskyttet",
 "The password is wrong. Try again." => "Passordet er feil. Prøv på nytt.",
 "Password" => "Passord",
-"%s shared the folder %s with you" => "%s delte mappen %s med deg",
-"%s shared the file %s with you" => "%s delte filen %s med deg",
-"Download" => "Last ned",
-"Upload" => "Last opp",
-"Cancel upload" => "Avbryt opplasting",
-"No preview available for" => "Forhåndsvisning ikke tilgjengelig for"
+"Sorry, this link doesn’t seem to work anymore." => "Beklager, denne lenken ser ikke ut til å virke lenger.",
+"Reasons might be:" => "Mulige årsaker:",
+"the item was removed" => "elementet er fjernet",
+"the link expired" => "lenken er utløpt",
+"sharing is disabled" => "deling er deaktivert",
+"For more info, please ask the person who sent this link." => "For mer informasjon, spør personen som sendte lenken.",
+"shared by %s" => "delt av %s",
+"Direct link" => "Direkte lenke"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index 687c6e134f..6151733f54 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Gedeeld door {owner}",
 "This share is password-protected" => "Deze share is met een wachtwoord beveiligd",
 "The password is wrong. Try again." => "Wachtwoord ongeldig. Probeer het nogmaals.",
 "Password" => "Wachtwoord",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "de link is verlopen",
 "sharing is disabled" => "delen is uitgeschakeld",
 "For more info, please ask the person who sent this link." => "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.",
-"%s shared the folder %s with you" => "%s deelt de map %s met u",
-"%s shared the file %s with you" => "%s deelt het bestand %s met u",
-"Download" => "Downloaden",
-"Upload" => "Uploaden",
-"Cancel upload" => "Upload afbreken",
-"No preview available for" => "Geen voorbeeldweergave beschikbaar voor",
+"shared by %s" => "gedeeld door %s",
+"Download %s" => "Download %s",
 "Direct link" => "Directe link"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
index 1f1e8001e7..6f7968e199 100644
--- a/apps/files_sharing/l10n/nn_NO.php
+++ b/apps/files_sharing/l10n/nn_NO.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Delt av {owner}",
 "The password is wrong. Try again." => "Passordet er gale. Prøv igjen.",
 "Password" => "Passord",
 "Sorry, this link doesn’t seem to work anymore." => "Orsak, denne lenkja fungerer visst ikkje lenger.",
@@ -7,12 +8,6 @@ $TRANSLATIONS = array(
 "the item was removed" => "fila/mappa er fjerna",
 "the link expired" => "lenkja har gått ut på dato",
 "sharing is disabled" => "deling er slått av",
-"For more info, please ask the person who sent this link." => "Spør den som sende deg lenkje om du vil ha meir informasjon.",
-"%s shared the folder %s with you" => "%s delte mappa %s med deg",
-"%s shared the file %s with you" => "%s delte fila %s med deg",
-"Download" => "Last ned",
-"Upload" => "Last opp",
-"Cancel upload" => "Avbryt opplasting",
-"No preview available for" => "Inga førehandsvising tilgjengeleg for"
+"For more info, please ask the person who sent this link." => "Spør den som sende deg lenkje om du vil ha meir informasjon."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
index 299d98e58b..c67cdf272f 100644
--- a/apps/files_sharing/l10n/oc.php
+++ b/apps/files_sharing/l10n/oc.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Senhal",
-"Download" => "Avalcarga",
-"Upload" => "Amontcarga",
-"Cancel upload" => " Anulla l'amontcargar"
+"Password" => "Senhal"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pa.php b/apps/files_sharing/l10n/pa.php
index 6c14eda59d..6fee1e95f0 100644
--- a/apps/files_sharing/l10n/pa.php
+++ b/apps/files_sharing/l10n/pa.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "ਪਾਸਵਰ",
-"Download" => "ਡਾਊਨਲੋਡ",
-"Upload" => "ਅੱਪਲੋਡ",
-"Cancel upload" => "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
+"Password" => "ਪਾਸਵਰ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 4c7498ee1b..4ecdced1a1 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Udostępnione przez {owner}",
 "This share is password-protected" => "Udział ten jest chroniony hasłem",
 "The password is wrong. Try again." => "To hasło jest niewłaściwe. Spróbuj ponownie.",
 "Password" => "Hasło",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "link wygasł",
 "sharing is disabled" => "Udostępnianie jest wyłączone",
 "For more info, please ask the person who sent this link." => "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link.",
-"%s shared the folder %s with you" => "%s współdzieli folder z tobą %s",
-"%s shared the file %s with you" => "%s współdzieli z tobą plik %s",
-"Download" => "Pobierz",
-"Upload" => "Wyślij",
-"Cancel upload" => "Anuluj wysyłanie",
-"No preview available for" => "Podgląd nie jest dostępny dla",
+"shared by %s" => "udostępniony przez %s",
+"Download %s" => "Pobierz %s",
 "Direct link" => "Bezpośredni link"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
index ee03749795..4cd95b09dc 100644
--- a/apps/files_sharing/l10n/pt_BR.php
+++ b/apps/files_sharing/l10n/pt_BR.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Compartilhado por {owner}",
 "This share is password-protected" => "Este compartilhamento esta protegido por senha",
 "The password is wrong. Try again." => "Senha incorreta. Tente novamente.",
 "Password" => "Senha",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "o link expirou",
 "sharing is disabled" => "compartilhamento está desativada",
 "For more info, please ask the person who sent this link." => "Para mais informações, por favor, pergunte a pessoa que enviou este link.",
-"%s shared the folder %s with you" => "%s compartilhou a pasta %s com você",
-"%s shared the file %s with you" => "%s compartilhou o arquivo %s com você",
-"Download" => "Baixar",
-"Upload" => "Upload",
-"Cancel upload" => "Cancelar upload",
-"No preview available for" => "Nenhuma visualização disponível para",
+"shared by %s" => "compartilhado por %s",
+"Download %s" => "Baixar %s",
 "Direct link" => "Link direto"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index cd94211b5d..fdcc498fc2 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Partilhado por {owner}",
 "This share is password-protected" => "Esta partilha está protegida por palavra-chave",
 "The password is wrong. Try again." => "Password errada, por favor tente de novo",
 "Password" => "Palavra-passe",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "O link expirou",
 "sharing is disabled" => "A partilha está desativada",
 "For more info, please ask the person who sent this link." => "Para mais informações, por favor questione a pessoa que lhe enviou este link",
-"%s shared the folder %s with you" => "%s partilhou a pasta %s consigo",
-"%s shared the file %s with you" => "%s partilhou o ficheiro %s consigo",
-"Download" => "Transferir",
-"Upload" => "Carregar",
-"Cancel upload" => "Cancelar envio",
-"No preview available for" => "Não há pré-visualização para",
+"shared by %s" => "partilhada por %s",
+"Download %s" => "Download %s",
 "Direct link" => "Link direto"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
index 54e20ed6bb..ca0d5e077b 100644
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@@ -1,12 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "The password is wrong. Try again." => "Parola este incorectă. Încercaţi din nou.",
-"Password" => "Parolă",
-"%s shared the folder %s with you" => "%s a partajat directorul %s cu tine",
-"%s shared the file %s with you" => "%s a partajat fișierul %s cu tine",
-"Download" => "Descarcă",
-"Upload" => "Încărcare",
-"Cancel upload" => "Anulează încărcarea",
-"No preview available for" => "Nici o previzualizare disponibilă pentru "
+"Password" => "Parolă"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 8c48096f66..2b44e29a34 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -1,20 +1,16 @@
 <?php
 $TRANSLATIONS = array(
-"This share is password-protected" => "Эта шара защищена паролем",
+"Shared by {owner}" => "Доступ открыл {owner}",
+"This share is password-protected" => "Общий ресурс защищён паролем",
 "The password is wrong. Try again." => "Неверный пароль. Попробуйте еще раз.",
 "Password" => "Пароль",
 "Sorry, this link doesn’t seem to work anymore." => "К сожалению, эта ссылка, похоже не будет работать больше.",
 "Reasons might be:" => "Причиной может быть:",
 "the item was removed" => "объект был удалён",
 "the link expired" => "срок ссылки истёк",
-"sharing is disabled" => "обмен отключен",
-"For more info, please ask the person who sent this link." => "Для получения дополнительной информации, пожалуйста, спросите того кто отослал данную ссылку.",
-"%s shared the folder %s with you" => "%s открыл доступ к папке %s для Вас",
-"%s shared the file %s with you" => "%s открыл доступ к файлу %s для Вас",
-"Download" => "Скачать",
-"Upload" => "Загрузка",
-"Cancel upload" => "Отмена загрузки",
-"No preview available for" => "Предпросмотр недоступен для",
+"sharing is disabled" => "общий доступ отключён",
+"For more info, please ask the person who sent this link." => "Пожалуйста, обратитесь к отправителю данной ссылки.",
+"shared by %s" => "Поделиться с %s",
 "Direct link" => "Прямая ссылка"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index e840138564..5d3c0d0bed 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -1,11 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "මුර පදය",
-"%s shared the folder %s with you" => "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය",
-"%s shared the file %s with you" => "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය",
-"Download" => "බාන්න",
-"Upload" => "උඩුගත කරන්න",
-"Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
-"No preview available for" => "පූර්වදර්ශනයක් නොමැත"
+"Password" => "මුර පදය"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
index 4ea8cbdd77..4e9856da4a 100644
--- a/apps/files_sharing/l10n/sk_SK.php
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Zdieľa {owner}",
 "This share is password-protected" => "Toto zdieľanie je chránené heslom",
 "The password is wrong. Try again." => "Heslo je chybné. Skúste to znova.",
 "Password" => "Heslo",
@@ -9,12 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "linke vypršala platnosť",
 "sharing is disabled" => "zdieľanie je zakázané",
 "For more info, please ask the person who sent this link." => "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.",
-"%s shared the folder %s with you" => "%s zdieľa s vami priečinok %s",
-"%s shared the file %s with you" => "%s zdieľa s vami súbor %s",
-"Download" => "Sťahovanie",
-"Upload" => "Nahrať",
-"Cancel upload" => "Zrušiť nahrávanie",
-"No preview available for" => "Žiaden náhľad k dispozícii pre",
+"shared by %s" => "Zdieľa %s",
 "Direct link" => "Priama linka"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index d5ef46e180..7c1014b0ef 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Souporabo omogoča {owner}",
 "This share is password-protected" => "To mesto je zaščiteno z geslom.",
 "The password is wrong. Try again." => "Geslo je napačno. Poskusite znova.",
 "Password" => "Geslo",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "povezava je pretekla,",
 "sharing is disabled" => "souporaba je onemogočena.",
 "For more info, please ask the person who sent this link." => "Za več podrobnosti stopite v stik s pošiljateljem te povezave.",
-"%s shared the folder %s with you" => "Oseba %s je določila mapo %s za souporabo",
-"%s shared the file %s with you" => "Oseba %s je določila datoteko %s za souporabo",
-"Download" => "Prejmi",
-"Upload" => "Pošlji",
-"Cancel upload" => "Prekliči pošiljanje",
-"No preview available for" => "Predogled ni na voljo za",
+"shared by %s" => "souporabp omogoča %s",
+"Download %s" => "Prejmi %s",
 "Direct link" => "Neposredna povezava"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
index 473049f75e..b1db4d5c54 100644
--- a/apps/files_sharing/l10n/sq.php
+++ b/apps/files_sharing/l10n/sq.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"This share is password-protected" => "Kjo pjesë është e mbrojtur me fjalëkalim",
 "The password is wrong. Try again." => "Kodi është i gabuar. Provojeni përsëri.",
 "Password" => "Kodi",
 "Sorry, this link doesn’t seem to work anymore." => "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më.",
@@ -8,11 +9,6 @@ $TRANSLATIONS = array(
 "the link expired" => "lidhja ka skaduar",
 "sharing is disabled" => "ndarja është çaktivizuar",
 "For more info, please ask the person who sent this link." => "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje.",
-"%s shared the folder %s with you" => "%s ndau me ju dosjen %s",
-"%s shared the file %s with you" => "%s ndau me ju skedarin %s",
-"Download" => "Shkarko",
-"Upload" => "Ngarko",
-"Cancel upload" => "Anulo ngarkimin",
-"No preview available for" => "Shikimi paraprak nuk është i mundur për"
+"Direct link" => "Lidhje direkte"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
index e484ad25eb..bc963ac87b 100644
--- a/apps/files_sharing/l10n/sr.php
+++ b/apps/files_sharing/l10n/sr.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Лозинка",
-"Download" => "Преузми",
-"Upload" => "Отпреми",
-"Cancel upload" => "Прекини отпремање"
+"Password" => "Лозинка"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
index 08463e1510..7d5ba12c6e 100644
--- a/apps/files_sharing/l10n/sr@latin.php
+++ b/apps/files_sharing/l10n/sr@latin.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "Lozinka",
-"Download" => "Preuzmi",
-"Upload" => "Pošalji"
+"Password" => "Lozinka"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 055ef552d6..2d037f9186 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Delad av {owner}",
 "This share is password-protected" => "Den här delningen är lösenordsskyddad",
 "The password is wrong. Try again." => "Lösenordet är fel. Försök igen.",
 "Password" => "Lösenord",
@@ -9,12 +10,6 @@ $TRANSLATIONS = array(
 "the link expired" => "giltighet för länken har gått ut",
 "sharing is disabled" => "delning är inaktiverat",
 "For more info, please ask the person who sent this link." => "För mer information, kontakta den person som skickade den här länken.",
-"%s shared the folder %s with you" => "%s delade mappen %s med dig",
-"%s shared the file %s with you" => "%s delade filen %s med dig",
-"Download" => "Ladda ner",
-"Upload" => "Ladda upp",
-"Cancel upload" => "Avbryt uppladdning",
-"No preview available for" => "Ingen förhandsgranskning tillgänglig för",
 "Direct link" => "Direkt länk"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php
index 90a2fb417f..3b944d42e6 100644
--- a/apps/files_sharing/l10n/ta_LK.php
+++ b/apps/files_sharing/l10n/ta_LK.php
@@ -1,11 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "கடவுச்சொல்",
-"%s shared the folder %s with you" => "%s கோப்புறையானது %s உடன் பகிரப்பட்டது",
-"%s shared the file %s with you" => "%s கோப்பானது %s உடன் பகிரப்பட்டது",
-"Download" => "பதிவிறக்குக",
-"Upload" => "பதிவேற்றுக",
-"Cancel upload" => "பதிவேற்றலை இரத்து செய்க",
-"No preview available for" => "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
+"Shared by {owner}" => "பகிரப்பட்டது {சொந்தகாரர்}",
+"Password" => "கடவுச்சொல்"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index e192e0a97c..706d0a561e 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -1,11 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "รหัสผ่าน",
-"%s shared the folder %s with you" => "%s ได้แชร์โฟลเดอร์ %s ให้กับคุณ",
-"%s shared the file %s with you" => "%s ได้แชร์ไฟล์ %s ให้กับคุณ",
-"Download" => "ดาวน์โหลด",
-"Upload" => "อัพโหลด",
-"Cancel upload" => "ยกเลิกการอัพโหลด",
-"No preview available for" => "ไม่สามารถดูตัวอย่างได้สำหรับ"
+"Shared by {owner}" => "ถูกแชร์โดย {owner}",
+"Password" => "รหัสผ่าน"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
index 22fe8ed020..4177221e10 100644
--- a/apps/files_sharing/l10n/tr.php
+++ b/apps/files_sharing/l10n/tr.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "{owner} tarafından paylaşılmış",
 "This share is password-protected" => "Bu paylaşım parola korumalı",
 "The password is wrong. Try again." => "Parola hatalı. Yeniden deneyin.",
 "Password" => "Parola",
@@ -9,12 +10,8 @@ $TRANSLATIONS = array(
 "the link expired" => "bağlantı süresi dolmuş",
 "sharing is disabled" => "paylaşım devre dışı",
 "For more info, please ask the person who sent this link." => "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişime geçin.",
-"%s shared the folder %s with you" => "%s, %s klasörünü sizinle paylaştı",
-"%s shared the file %s with you" => "%s, %s dosyasını sizinle paylaştı",
-"Download" => "İndir",
-"Upload" => "Yükle",
-"Cancel upload" => "Yüklemeyi iptal et",
-"No preview available for" => "Kullanılabilir önizleme yok",
+"shared by %s" => "paylaşan: %s",
+"Download %s" => "İndir: %s",
 "Direct link" => "Doğrudan bağlantı"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
index 6ffa02f734..9de4178691 100644
--- a/apps/files_sharing/l10n/ug.php
+++ b/apps/files_sharing/l10n/ug.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "ئىم",
-"Download" => "چۈشۈر",
-"Upload" => "يۈكلە",
-"Cancel upload" => "يۈكلەشتىن ۋاز كەچ"
+"Password" => "ئىم"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index 842b4b8d96..204b8e174a 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Опублікував {owner}",
 "This share is password-protected" => "Цей ресурс обміну захищений паролем",
 "The password is wrong. Try again." => "Невірний пароль. Спробуйте ще раз.",
 "Password" => "Пароль",
@@ -9,12 +10,6 @@ $TRANSLATIONS = array(
 "the link expired" => "посилання застаріло",
 "sharing is disabled" => "обмін заборонений",
 "For more info, please ask the person who sent this link." => "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання.",
-"%s shared the folder %s with you" => "%s опублікував каталог %s для Вас",
-"%s shared the file %s with you" => "%s опублікував файл %s для Вас",
-"Download" => "Завантажити",
-"Upload" => "Вивантажити",
-"Cancel upload" => "Перервати завантаження",
-"No preview available for" => "Попередній перегляд недоступний для",
 "Direct link" => "Пряме посилання"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
index 4566d3744d..e1a65f2751 100644
--- a/apps/files_sharing/l10n/vi.php
+++ b/apps/files_sharing/l10n/vi.php
@@ -1,11 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "Được chia sẽ bởi {owner}",
 "Password" => "Mật khẩu",
-"%s shared the folder %s with you" => "%s đã chia sẻ thư mục %s với bạn",
-"%s shared the file %s with you" => "%s đã chia sẻ tập tin %s với bạn",
-"Download" => "Tải về",
-"Upload" => "Tải lên",
-"Cancel upload" => "Hủy upload",
-"No preview available for" => "Không có xem trước cho"
+"shared by %s" => " Được chia sẻ bởi %s"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
index 956c161b48..8946741a30 100644
--- a/apps/files_sharing/l10n/zh_CN.php
+++ b/apps/files_sharing/l10n/zh_CN.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "由{owner}共享",
+"This share is password-protected" => "这是一个密码保护的共享",
 "The password is wrong. Try again." => "用户名或密码错误！请重试",
 "Password" => "密码",
 "Sorry, this link doesn’t seem to work anymore." => "抱歉，此链接已失效",
@@ -8,11 +10,7 @@ $TRANSLATIONS = array(
 "the link expired" => "链接过期",
 "sharing is disabled" => "共享已禁用",
 "For more info, please ask the person who sent this link." => "欲知详情，请联系发给你链接的人。",
-"%s shared the folder %s with you" => "%s与您共享了%s文件夹",
-"%s shared the file %s with you" => "%s与您共享了%s文件",
-"Download" => "下载",
-"Upload" => "上传",
-"Cancel upload" => "取消上传",
-"No preview available for" => "没有预览"
+"shared by %s" => "由 %s 共享",
+"Direct link" => "直接链接"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php
index 434420264e..5904309749 100644
--- a/apps/files_sharing/l10n/zh_HK.php
+++ b/apps/files_sharing/l10n/zh_HK.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Password" => "密碼",
-"Download" => "下載",
-"Upload" => "上傳"
+"Password" => "密碼"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index 3854b7ae58..eb591fa359 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Shared by {owner}" => "由 {owner} 分享",
 "This share is password-protected" => "這個分享有密碼保護",
 "The password is wrong. Try again." => "請檢查您的密碼並再試一次",
 "Password" => "密碼",
@@ -8,12 +9,6 @@ $TRANSLATIONS = array(
 "the item was removed" => "項目已經移除",
 "the link expired" => "連結過期",
 "sharing is disabled" => "分享功能已停用",
-"For more info, please ask the person who sent this link." => "請詢問告訴您此連結的人以瞭解更多",
-"%s shared the folder %s with you" => "%s 和您分享了資料夾 %s ",
-"%s shared the file %s with you" => "%s 和您分享了檔案 %s",
-"Download" => "下載",
-"Upload" => "上傳",
-"Cancel upload" => "取消上傳",
-"No preview available for" => "無法預覽"
+"For more info, please ask the person who sent this link." => "請詢問告訴您此連結的人以瞭解更多"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/lib/api.php b/apps/files_sharing/lib/api.php
index 0ba58aa896..de3c1cd263 100644
--- a/apps/files_sharing/lib/api.php
+++ b/apps/files_sharing/lib/api.php
@@ -68,7 +68,7 @@ class Api {
 	public static function getShare($params) {
 
 		$s = self::getShareFromId($params['id']);
-		$params['itemSource'] = $s['item_source'];
+		$params['itemSource'] = $s['file_source'];
 		$params['itemType'] = $s['item_type'];
 		$params['specificShare'] = true;
 
@@ -98,8 +98,14 @@ class Api {
 						break;
 					}
 				}
+			} else {
+				$path = $params['path'];
+				foreach ($shares as $key => $share) {
+					$shares[$key]['path'] = $path;
+				}
 			}
 
+
 			// include also reshares in the lists. This means that the result
 			// will contain every user with access to the file.
 			if (isset($params['reshares']) && $params['reshares'] === true) {
@@ -107,8 +113,10 @@ class Api {
 			}
 
 			if ($receivedFrom) {
-				$shares['received_from'] = $receivedFrom['uid_owner'];
-				$shares['received_from_displayname'] = \OCP\User::getDisplayName($receivedFrom['uid_owner']);
+				foreach ($shares as $key => $share) {
+					$shares[$key]['received_from'] = $receivedFrom['uid_owner'];
+					$shares[$key]['received_from_displayname'] = \OCP\User::getDisplayName($receivedFrom['uid_owner']);
+				}
 			}
 		} else {
 			$shares = null;
@@ -174,9 +182,12 @@ class Api {
 			$share = \OCP\Share::getItemShared($itemType, $file['fileid']);
 			if($share) {
 				$receivedFrom =  \OCP\Share::getItemSharedWithBySource($itemType, $file['fileid']);
+				reset($share);
+				$key = key($share);
+				$share[$key]['path'] = self::correctPath($share[$key]['path'], $path);
 				if ($receivedFrom) {
-					$share['received_from'] = $receivedFrom['uid_owner'];
-					$share['received_from_displayname'] = \OCP\User::getDisplayName($receivedFrom['uid_owner']);
+					$share[$key]['received_from'] = $receivedFrom['uid_owner'];
+					$share[$key]['received_from_displayname'] = \OCP\User::getDisplayName($receivedFrom['uid_owner']);
 				}
 				$result = array_merge($result, $share);
 			}
@@ -281,9 +292,8 @@ class Api {
 	public static function updateShare($params) {
 
 		$share = self::getShareFromId($params['id']);
-		$itemSource = isset($share['item_source']) ? $share['item_source'] : null;
 
-		if($itemSource === null) {
+		if(!isset($share['file_source'])) {
 			return new \OC_OCS_Result(null, 404, "wrong share Id, share doesn't exist.");
 		}
 
@@ -431,10 +441,10 @@ class Api {
 	public static function deleteShare($params) {
 
 		$share = self::getShareFromId($params['id']);
-		$itemSource = isset($share['item_source']) ? $share['item_source'] : null;
+		$fileSource = isset($share['file_source']) ? $share['file_source'] : null;
 		$itemType = isset($share['item_type']) ? $share['item_type'] : null;;
 
-		if($itemSource === null) {
+		if($fileSource === null) {
 			return new \OC_OCS_Result(null, 404, "wrong share ID, share doesn't exist.");
 		}
 
@@ -448,7 +458,7 @@ class Api {
 		try {
 			$return = \OCP\Share::unshare(
 					$itemType,
-					$itemSource,
+					$fileSource,
 					$shareType,
 					$shareWith);
 		} catch (\Exception $e) {
@@ -504,7 +514,7 @@ class Api {
 	 * @return array with: item_source, share_type, share_with, item_type, permissions
 	 */
 	private static function getShareFromId($shareID) {
-		$sql = 'SELECT `item_source`, `share_type`, `share_with`, `item_type`, `permissions` FROM `*PREFIX*share` WHERE `id` = ?';
+		$sql = 'SELECT `file_source`, `item_source`, `share_type`, `share_with`, `item_type`, `permissions` FROM `*PREFIX*share` WHERE `id` = ?';
 		$args = array($shareID);
 		$query = \OCP\DB::prepare($sql);
 		$result = $query->execute($args);
@@ -521,4 +531,15 @@ class Api {
 
 	}
 
+	/**
+	 * @brief make sure that the path has the correct root
+	 *
+	 * @param string $path path returned from the share API
+	 * @param string $folder current root folder
+	 * @return string the correct path
+	 */
+	protected static function correctPath($path, $folder) {
+		return \OC_Filesystem::normalizePath('/' . $folder . '/' . basename($path));
+	}
+
 }
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 4b0da0b002..01db29d72e 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -137,9 +137,12 @@ class Shared_Cache extends Cache {
 		} else {
 			$cache = $this->getSourceCache($folder);
 			if ($cache) {
+				$parent = $this->storage->getFile($folder);
 				$sourceFolderContent = $cache->getFolderContents($this->files[$folder]);
 				foreach ($sourceFolderContent as $key => $c) {
 					$sourceFolderContent[$key]['usersPath'] = 'files/Shared/' . $folder . '/' . $c['name'];
+					$sourceFolderContent[$key]['uid_owner'] = $parent['uid_owner'];
+					$sourceFolderContent[$key]['displayname_owner'] = $parent['uid_owner'];
 				}
 
 				return $sourceFolderContent;
@@ -354,9 +357,10 @@ class Shared_Cache extends Cache {
 	 * get the size of a folder and set it in the cache
 	 *
 	 * @param string $path
+	 * @param array $entry (optional) meta data of the folder
 	 * @return int
 	 */
-	public function calculateFolderSize($path) {
+	public function calculateFolderSize($path, $entry = null) {
 		if ($cache = $this->getSourceCache($path)) {
 			return $cache->calculateFolderSize($this->files[$path]);
 		}
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index ec0f368386..5e00050fe1 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -94,6 +94,9 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 				$file['mtime'] = $item['mtime'];
 				$file['encrypted'] = $item['encrypted'];
 				$file['etag'] = $item['etag'];
+				$file['uid_owner'] = $item['uid_owner'];
+				$file['displayname_owner'] = $item['displayname_owner'];
+
 				$storage = \OC\Files\Filesystem::getStorage('/');
 				$cache = $storage->getCache();
 				if ($item['encrypted'] or ($item['unencrypted_size'] > 0 and $cache->getMimetype($item['mimetype']) === 'httpd/unix-directory')) {
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 19b1fb2763..055329ecab 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -12,7 +12,7 @@
 				placeholder="" value=""
 				autocomplete="off" autocapitalize="off" autocorrect="off"
 				autofocus />
-			<input type="submit" value="" class="svg icon icon-confirm" />
+			<input type="submit" value="" class="svg icon-confirm" />
 		</p>
 	</fieldset>
 </form>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 3eb84ce167..fc8d59e1e8 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -9,7 +9,7 @@
 <input type="hidden" name="sharingToken" value="<?php p($_['sharingToken']) ?>" id="sharingToken">
 <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename">
 <input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
-<header><div id="header" class="icon icon-noise <?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
+<header><div id="header" class="icon-noise <?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
 		<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg"
 		                                                                                          src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($theme->getName()); ?>" /></a>
 		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 0d3d9b98b2..e3c5b6e431 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -34,15 +34,17 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 
 		$this->folder = '/folder_share_api_test';
 		$this->subfolder  = '/subfolder_share_api_test';
+		$this->subsubfolder = '/subsubfolder_share_api_test';
 
-		$this->filename = 'share-api-test.txt';
+		$this->filename = '/share-api-test.txt';
 
 		// save file with content
 		$this->view->file_put_contents($this->filename, $this->data);
 		$this->view->mkdir($this->folder);
-		$this->view->mkdir($this->folder . '/' . $this->subfolder);
-		$this->view->file_put_contents($this->folder.'/'.$this->filename, $this->data);
-		$this->view->file_put_contents($this->folder.'/' . $this->subfolder . '/' .$this->filename, $this->data);
+		$this->view->mkdir($this->folder . $this->subfolder);
+		$this->view->mkdir($this->folder . $this->subfolder . $this->subsubfolder);
+		$this->view->file_put_contents($this->folder.$this->filename, $this->data);
+		$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
 	}
 
 	function tearDown() {
@@ -323,9 +325,9 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 
 		$testValues=array(
 			array('query' => 'Shared/' . $this->folder,
-				'expectedResult' => '/Shared' . $this->folder . '/' . $this->filename),
+				'expectedResult' => '/Shared' . $this->folder . $this->filename),
 			array('query' => 'Shared/' . $this->folder . $this->subfolder,
-				'expectedResult' => '/Shared' . $this->folder . $this->subfolder . '/' . $this->filename),
+				'expectedResult' => '/Shared' . $this->folder . $this->subfolder . $this->filename),
 		);
 		foreach ($testValues as $value) {
 
@@ -354,6 +356,278 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 
 	}
 
+	/**
+	 * @brief reshare a sub folder and check if we get the correct path
+	 * @medium
+	 */
+	function testGetShareFromSubFolderReShares() {
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+
+		$fileInfo = $this->view->getFileInfo($this->folder . $this->subfolder);
+
+		// share sub-folder to user2
+		$result = \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+
+		// share was successful?
+		$this->assertTrue($result);
+
+		// login as user2
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+		// reshare subfolder
+		$result = \OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1);
+
+		// share was successful?
+		$this->assertTrue(is_string($result));
+
+		$_GET['path'] = '/Shared';
+		$_GET['subfiles'] = 'true';
+
+		$result = Share\Api::getAllShares(array());
+
+		$this->assertTrue($result->succeeded());
+
+		// test should return one share within $this->folder
+		$data = $result->getData();
+
+		// we should get exactly one result
+		$this->assertEquals(1, count($data));
+
+		$expectedPath = '/Shared' . $this->subfolder;
+		$this->assertEquals($expectedPath, $data[0]['path']);
+
+		// cleanup
+		$result = \OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+		$this->assertTrue($result);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		$result = \OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue($result);
+
+	}
+
+	/**
+	 * @brief test re-re-share of folder if the path gets constructed correctly
+	 * @medium
+	 */
+	function testGetShareFromFolderReReShares() {
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+
+		$fileInfo1 = $this->view->getFileInfo($this->folder . $this->subfolder);
+		$fileInfo2 = $this->view->getFileInfo($this->folder . $this->subfolder . $this->subsubfolder);
+
+		// share sub-folder to user2
+		$result = \OCP\Share::shareItem('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+
+		// share was successful?
+		$this->assertTrue($result);
+
+		// login as user2
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+		// reshare subsubfolder
+		$result = \OCP\Share::shareItem('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3, 31);
+		// share was successful?
+		$this->assertTrue($result);
+
+		// login as user3
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER3);
+
+		$result = \OCP\Share::shareItem('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1);
+		// share was successful?
+		$this->assertTrue(is_string($result));
+
+
+		$_GET['path'] = '/Shared';
+		$_GET['subfiles'] = 'true';
+
+		$result = Share\Api::getAllShares(array());
+
+		$this->assertTrue($result->succeeded());
+
+		// test should return one share within $this->folder
+		$data = $result->getData();
+
+		// we should get exactly one result
+		$this->assertEquals(1, count($data));
+
+		$expectedPath = '/Shared' . $this->subsubfolder;
+		$this->assertEquals($expectedPath, $data[0]['path']);
+
+
+		// cleanup
+		$result = \OCP\Share::unshare('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+		$this->assertTrue($result);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+		$result = \OCP\Share::unshare('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3);
+		$this->assertTrue($result);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		$result = \OCP\Share::unshare('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue($result);
+
+	}
+
+	/**
+	 * @brief test multiple shared folder if the path gets constructed correctly
+	 * @medium
+	 */
+	function testGetShareMultipleSharedFolder() {
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+
+		$fileInfo1 = $this->view->getFileInfo($this->folder);
+		$fileInfo2 = $this->view->getFileInfo($this->folder . $this->subfolder);
+
+
+		// share sub-folder to user2
+		$result = \OCP\Share::shareItem('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+
+		// share was successful?
+		$this->assertTrue($result);
+
+		// share folder to user2
+		$result = \OCP\Share::shareItem('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+
+		// share was successful?
+		$this->assertTrue($result);
+
+
+		// login as user2
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+		$result = \OCP\Share::shareItem('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1);
+		// share was successful?
+		$this->assertTrue(is_string($result));
+
+
+		// ask for shared/subfolder
+		$expectedPath1 = '/Shared' . $this->subfolder;
+		$_GET['path'] = $expectedPath1;
+
+		$result1 = Share\Api::getAllShares(array());
+
+		$this->assertTrue($result1->succeeded());
+
+		// test should return one share within $this->folder
+		$data1 = $result1->getData();
+		$share1 = reset($data1);
+
+		// ask for shared/folder/subfolder
+		$expectedPath2 = '/Shared' . $this->folder . $this->subfolder;
+		$_GET['path'] = $expectedPath2;
+
+		$result2 = Share\Api::getAllShares(array());
+
+		$this->assertTrue($result2->succeeded());
+
+		// test should return one share within $this->folder
+		$data2 = $result2->getData();
+		$share2 = reset($data2);
+
+
+		// validate results
+		// we should get exactly one result each time
+		$this->assertEquals(1, count($data1));
+		$this->assertEquals(1, count($data2));
+
+		$this->assertEquals($expectedPath1, $share1['path']);
+		$this->assertEquals($expectedPath2, $share2['path']);
+
+
+		// cleanup
+		$result = \OCP\Share::unshare('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+		$this->assertTrue($result);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		$result = \OCP\Share::unshare('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue($result);
+		$result = \OCP\Share::unshare('folder', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue($result);
+
+	}
+
+	/**
+	 * @brief test re-re-share of folder if the path gets constructed correctly
+	 * @medium
+	 */
+	function testGetShareFromFileReReShares() {
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+
+		$fileInfo1 = $this->view->getFileInfo($this->folder . $this->subfolder);
+		$fileInfo2 = $this->view->getFileInfo($this->folder. $this->subfolder . $this->filename);
+
+		// share sub-folder to user2
+		$result = \OCP\Share::shareItem('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+
+		// share was successful?
+		$this->assertTrue($result);
+
+		// login as user2
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+
+		// reshare subsubfolder
+		$result = \OCP\Share::shareItem('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3, 31);
+		// share was successful?
+		$this->assertTrue($result);
+
+		// login as user3
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER3);
+
+		$result = \OCP\Share::shareItem('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1);
+		// share was successful?
+		$this->assertTrue(is_string($result));
+
+
+		$_GET['path'] = '/Shared';
+		$_GET['subfiles'] = 'true';
+
+		$result = Share\Api::getAllShares(array());
+
+		$this->assertTrue($result->succeeded());
+
+		// test should return one share within $this->folder
+		$data = $result->getData();
+
+		// we should get exactly one result
+		$this->assertEquals(1, count($data));
+
+		$expectedPath = '/Shared' . $this->filename;
+		$this->assertEquals($expectedPath, $data[0]['path']);
+
+
+		// cleanup
+		$result = \OCP\Share::unshare('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
+		$this->assertTrue($result);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+		$result = \OCP\Share::unshare('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER3);
+		$this->assertTrue($result);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		$result = \OCP\Share::unshare('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue($result);
+
+	}
+
 	/**
 	 * @medium
 	 */
@@ -559,4 +833,58 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		$this->assertTrue(empty($itemsAfterDelete));
 
 	}
+
+	/**
+	 * @brief test unshare of a reshared file
+	 */
+	function testDeleteReshare() {
+
+		// user 1 shares a folder with user2
+		\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
+
+		$fileInfo1 = $this->view->getFileInfo($this->folder);
+		$fileInfo2 = $this->view->getFileInfo($this->folder.'/'.$this->filename);
+
+		$result1 = \OCP\Share::shareItem('folder', $fileInfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
+
+		$this->assertTrue($result1);
+
+		// user2 shares a file from the folder as link
+		\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
+
+		$result2 = \OCP\Share::shareItem('file', $fileInfo2['fileid'], \OCP\Share::SHARE_TYPE_LINK, null, 1);
+
+		$this->assertTrue(is_string($result2));
+
+		// test if we can unshare the link again
+		$items = \OCP\Share::getItemShared('file', null);
+		$this->assertEquals(1, count($items));
+
+		$item = reset($items);
+		$result3 = Share\Api::deleteShare(array('id' => $item['id']));
+
+		$this->assertTrue($result3->succeeded());
+
+	}
+
+	function testCorrectPath() {
+		$path = "/foo/bar/test.txt";
+		$folder = "/correct/path";
+		$expectedResult = "/correct/path/test.txt";
+
+		$shareApiDummy = new TestShareApi();
+
+		$this->assertSame($expectedResult, $shareApiDummy->correctPathTest($path, $folder));
+	}
+
+}
+
+/**
+ * @brief dumnmy class to test protected methods
+ */
+class TestShareApi extends \OCA\Files\Share\Api {
+	public function correctPathTest($path, $folder) {
+		return self::correctPath($path, $folder);
+	}
 }
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index c9dc13b784..cec18c4652 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -1,11 +1,5 @@
 <?php
 
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem');
-
-// Init owncloud
-
-
 OCP\JSON::checkLoggedIn();
 
 // Load the files
@@ -26,9 +20,9 @@ if($doBreadcrumb) {
 }
 
 // make filelist
-$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
-
-if ($files === null){
+try {
+	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
+} catch (Exception $e) {
 	header("HTTP/1.0 404 Not Found");
 	exit();
 }
diff --git a/apps/files_trashbin/appinfo/database.xml b/apps/files_trashbin/appinfo/database.xml
index d08c3469b0..db104ee929 100644
--- a/apps/files_trashbin/appinfo/database.xml
+++ b/apps/files_trashbin/appinfo/database.xml
@@ -49,7 +49,7 @@
     <name>type</name>
     <type>text</type>
     <default></default>
-    <notnull>true</notnull>
+    <notnull>false</notnull>
     <length>4</length>
    </field>
 
@@ -57,7 +57,7 @@
     <name>mime</name>
     <type>text</type>
     <default></default>
-    <notnull>true</notnull>
+    <notnull>false</notnull>
     <length>255</length>
    </field>
 
diff --git a/apps/files_trashbin/appinfo/update.php b/apps/files_trashbin/appinfo/update.php
index 0ca232668d..ca7b87a868 100644
--- a/apps/files_trashbin/appinfo/update.php
+++ b/apps/files_trashbin/appinfo/update.php
@@ -2,7 +2,7 @@
 
 $installedVersion=OCP\Config::getAppValue('files_trashbin', 'installed_version');
 
-if (version_compare($installedVersion, '0.4', '<')) {
+if (version_compare($installedVersion, '0.6', '<')) {
 	//size of the trash bin could be incorrect, remove it for all users to
 	//enforce a recalculation during next usage.
 	$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trashsize`');
diff --git a/apps/files_trashbin/appinfo/version b/apps/files_trashbin/appinfo/version
index 2eb3c4fe4e..5a2a5806df 100644
--- a/apps/files_trashbin/appinfo/version
+++ b/apps/files_trashbin/appinfo/version
@@ -1 +1 @@
-0.5
+0.6
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 93f385dd30..f0c5b0508b 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -37,19 +37,18 @@ if ($isIE8 && isset($_GET['dir'])){
 $ajaxLoad = false;
 
 if (!$isIE8){
-	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
+	try {
+		$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
+	} catch (Exception $e) {
+		header('Location: ' . OCP\Util::linkTo('files_trashbin', 'index.php'));
+		exit();
+	}
 }
 else{
 	$files = array();
 	$ajaxLoad = true;
 }
 
-// Redirect if directory does not exist
-if ($files === null){
-	header('Location: ' . OCP\Util::linkTo('files_trashbin', 'index.php'));
-	exit();
-}
-
 $dirlisting = false;
 if ($dir && $dir !== '/') {
     $dirlisting = true;
diff --git a/apps/files_trashbin/js/trash.js b/apps/files_trashbin/js/trash.js
index 6aade21050..efe1e89f0b 100644
--- a/apps/files_trashbin/js/trash.js
+++ b/apps/files_trashbin/js/trash.js
@@ -25,6 +25,11 @@ $(document).ready(function() {
 		enableActions();
 	}
 
+	Files.updateStorageStatistics = function() {
+		// no op because the trashbin doesn't have
+		// storage info like free space / used space
+	};
+
 	if (typeof FileActions !== 'undefined') {
 		FileActions.register('all', 'Restore', OC.PERMISSION_READ, OC.imagePath('core', 'actions/history'), function(filename) {
 			var tr = FileList.findFileEl(filename);
diff --git a/apps/files_trashbin/l10n/ar.php b/apps/files_trashbin/l10n/ar.php
index 9733e6b100..4084daa127 100644
--- a/apps/files_trashbin/l10n/ar.php
+++ b/apps/files_trashbin/l10n/ar.php
@@ -2,7 +2,9 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "تعذّر حذف%s بشكل دائم",
 "Couldn't restore %s" => "تعذّر استرجاع %s ",
+"Deleted files" => "حذف الملفات",
 "Error" => "خطأ",
+"restored" => "تمت الاستعادة",
 "Nothing in here. Your trash bin is empty!" => "لا يوجد شيء هنا. سلة المهملات خاليه.",
 "Name" => "اسم",
 "Restore" => "استعيد",
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
index fa3f63ddb2..c99b414c7a 100644
--- a/apps/files_trashbin/l10n/ca.php
+++ b/apps/files_trashbin/l10n/ca.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No s'ha pogut esborrar permanentment %s",
 "Couldn't restore %s" => "No s'ha pogut restaurar %s",
+"Deleted files" => "Fitxers esborrats",
 "Error" => "Error",
 "restored" => "restaurat",
 "Nothing in here. Your trash bin is empty!" => "La paperera està buida!",
diff --git a/apps/files_trashbin/l10n/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
index ff0a69572f..e0c46c5137 100644
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ b/apps/files_trashbin/l10n/cs_CZ.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nelze trvale odstranit %s",
 "Couldn't restore %s" => "Nelze obnovit %s",
+"Deleted files" => "Odstraněné soubory",
 "Error" => "Chyba",
 "restored" => "obnoveno",
 "Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
diff --git a/apps/files_trashbin/l10n/cy_GB.php b/apps/files_trashbin/l10n/cy_GB.php
index f2eb81d67d..bc8a318733 100644
--- a/apps/files_trashbin/l10n/cy_GB.php
+++ b/apps/files_trashbin/l10n/cy_GB.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Methwyd dileu %s yn barhaol",
 "Couldn't restore %s" => "Methwyd adfer %s",
+"Deleted files" => "Ffeiliau ddilewyd",
 "Error" => "Gwall",
 "Nothing in here. Your trash bin is empty!" => "Does dim byd yma. Mae eich bin sbwriel yn wag!",
 "Name" => "Enw",
diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php
index c396706d15..831ba6067d 100644
--- a/apps/files_trashbin/l10n/da.php
+++ b/apps/files_trashbin/l10n/da.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunne ikke slette %s permanent",
 "Couldn't restore %s" => "Kunne ikke gendanne %s",
+"Deleted files" => "Slettede filer",
 "Error" => "Fejl",
 "restored" => "Gendannet",
 "Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
diff --git a/apps/files_trashbin/l10n/de.php b/apps/files_trashbin/l10n/de.php
index 2b6703dd05..fd00b4c433 100644
--- a/apps/files_trashbin/l10n/de.php
+++ b/apps/files_trashbin/l10n/de.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
+"Deleted files" => "Gelöschte Dateien",
 "Error" => "Fehler",
 "restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, der Papierkorb ist leer!",
diff --git a/apps/files_trashbin/l10n/de_AT.php b/apps/files_trashbin/l10n/de_AT.php
index 0acad00e8b..afa3eff001 100644
--- a/apps/files_trashbin/l10n/de_AT.php
+++ b/apps/files_trashbin/l10n/de_AT.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("","")
+"Delete" => "Löschen"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de_CH.php b/apps/files_trashbin/l10n/de_CH.php
index ec9f0b5309..665be5d5ee 100644
--- a/apps/files_trashbin/l10n/de_CH.php
+++ b/apps/files_trashbin/l10n/de_CH.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
+"Deleted files" => "Gelöschte Dateien",
 "Error" => "Fehler",
 "restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
diff --git a/apps/files_trashbin/l10n/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
index ec9f0b5309..665be5d5ee 100644
--- a/apps/files_trashbin/l10n/de_DE.php
+++ b/apps/files_trashbin/l10n/de_DE.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Konnte %s nicht dauerhaft löschen",
 "Couldn't restore %s" => "Konnte %s nicht wiederherstellen",
+"Deleted files" => "Gelöschte Dateien",
 "Error" => "Fehler",
 "restored" => "Wiederhergestellt",
 "Nothing in here. Your trash bin is empty!" => "Nichts zu löschen, Ihr Papierkorb ist leer!",
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
index b4ee30c578..567958de90 100644
--- a/apps/files_trashbin/l10n/el.php
+++ b/apps/files_trashbin/l10n/el.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Αδύνατη η μόνιμη διαγραφή του %s",
 "Couldn't restore %s" => "Αδυναμία επαναφοράς %s",
+"Deleted files" => "Διαγραμμένα αρχεία",
 "Error" => "Σφάλμα",
 "restored" => "επαναφέρθηκαν",
 "Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
diff --git a/apps/files_trashbin/l10n/en_GB.php b/apps/files_trashbin/l10n/en_GB.php
index 6b179c8653..04abf2d6f2 100644
--- a/apps/files_trashbin/l10n/en_GB.php
+++ b/apps/files_trashbin/l10n/en_GB.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Couldn't delete %s permanently",
 "Couldn't restore %s" => "Couldn't restore %s",
+"Deleted files" => "Deleted files",
 "Error" => "Error",
 "restored" => "restored",
 "Nothing in here. Your trash bin is empty!" => "Nothing in here. Your recycle bin is empty!",
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
index b8f999eaaf..b3248406f5 100644
--- a/apps/files_trashbin/l10n/eo.php
+++ b/apps/files_trashbin/l10n/eo.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Ne povis foriĝi %s por ĉiam",
 "Couldn't restore %s" => "Ne povis restaŭriĝi %s",
+"Deleted files" => "Forigitaj dosieroj",
 "Error" => "Eraro",
 "restored" => "restaŭrita",
 "Nothing in here. Your trash bin is empty!" => "Nenio estas ĉi tie. Via rubujo malplenas!",
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
index db7a617729..79f122ad35 100644
--- a/apps/files_trashbin/l10n/es.php
+++ b/apps/files_trashbin/l10n/es.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
 "Couldn't restore %s" => "No se puede restaurar %s",
+"Deleted files" => "Archivos eliminados",
 "Error" => "Error",
 "restored" => "recuperado",
 "Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
index 842101d33b..50b337b814 100644
--- a/apps/files_trashbin/l10n/es_AR.php
+++ b/apps/files_trashbin/l10n/es_AR.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No fue posible borrar %s de manera permanente",
 "Couldn't restore %s" => "No se pudo restaurar %s",
+"Deleted files" => "Archivos borrados",
 "Error" => "Error",
 "restored" => "recuperado",
 "Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!",
diff --git a/apps/files_trashbin/l10n/es_CL.php b/apps/files_trashbin/l10n/es_CL.php
new file mode 100644
index 0000000000..45584ff7c4
--- /dev/null
+++ b/apps/files_trashbin/l10n/es_CL.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Error" => "Error"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es_MX.php b/apps/files_trashbin/l10n/es_MX.php
index db7a617729..79f122ad35 100644
--- a/apps/files_trashbin/l10n/es_MX.php
+++ b/apps/files_trashbin/l10n/es_MX.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
 "Couldn't restore %s" => "No se puede restaurar %s",
+"Deleted files" => "Archivos eliminados",
 "Error" => "Error",
 "restored" => "recuperado",
 "Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
index 56eebc79f0..69ed5cee76 100644
--- a/apps/files_trashbin/l10n/et_EE.php
+++ b/apps/files_trashbin/l10n/et_EE.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s jäädavalt kustutamine ebaõnnestus",
 "Couldn't restore %s" => "%s ei saa taastada",
+"Deleted files" => "Kustutatud failid",
 "Error" => "Viga",
 "restored" => "taastatud",
 "Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prügikast on tühi!",
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
index 04d92e01b3..648aaaf738 100644
--- a/apps/files_trashbin/l10n/eu.php
+++ b/apps/files_trashbin/l10n/eu.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Ezin izan da %s betirako ezabatu",
 "Couldn't restore %s" => "Ezin izan da %s berreskuratu",
+"Deleted files" => "Ezabatutako fitxategiak",
 "Error" => "Errorea",
 "restored" => "Berrezarrita",
 "Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
diff --git a/apps/files_trashbin/l10n/eu_ES.php b/apps/files_trashbin/l10n/eu_ES.php
new file mode 100644
index 0000000000..8612c8609b
--- /dev/null
+++ b/apps/files_trashbin/l10n/eu_ES.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Delete" => "Ezabatu"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
index 8409987b89..40cdec8a48 100644
--- a/apps/files_trashbin/l10n/fa.php
+++ b/apps/files_trashbin/l10n/fa.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s را نمی توان برای همیشه حذف کرد",
 "Couldn't restore %s" => "%s را نمی توان بازگرداند",
+"Deleted files" => "فایل های حذف شده",
 "Error" => "خطا",
 "Nothing in here. Your trash bin is empty!" => "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است.",
 "Name" => "نام",
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
index b956c1c1e4..e7b62dbb43 100644
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ b/apps/files_trashbin/l10n/fi_FI.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kohdetta %s ei voitu poistaa pysyvästi",
 "Couldn't restore %s" => "Kohteen %s palautus epäonnistui",
+"Deleted files" => "Poistetut tiedostot",
 "Error" => "Virhe",
 "restored" => "palautettu",
 "Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.",
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
index 593310e2c3..9e74657fc1 100644
--- a/apps/files_trashbin/l10n/fr.php
+++ b/apps/files_trashbin/l10n/fr.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Impossible d'effacer %s de façon permanente",
 "Couldn't restore %s" => "Impossible de restaurer %s",
+"Deleted files" => "Fichiers supprimés",
 "Error" => "Erreur",
 "restored" => "restauré",
 "Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
index ae7ef8b319..bf26936be0 100644
--- a/apps/files_trashbin/l10n/gl.php
+++ b/apps/files_trashbin/l10n/gl.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Non foi posíbel eliminar %s permanente",
 "Couldn't restore %s" => "Non foi posíbel restaurar %s",
+"Deleted files" => "Ficheiros eliminados",
 "Error" => "Erro",
 "restored" => "restaurado",
 "Nothing in here. Your trash bin is empty!" => "Aquí non hai nada. O cesto do lixo está baleiro!",
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
index d0bcb327d4..6d2d184bec 100644
--- a/apps/files_trashbin/l10n/he.php
+++ b/apps/files_trashbin/l10n/he.php
@@ -2,7 +2,9 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "לא ניתן למחוק את %s לצמיתות",
 "Couldn't restore %s" => "לא ניתן לשחזר את %s",
+"Deleted files" => "קבצים שנמחקו",
 "Error" => "שגיאה",
+"restored" => "שוחזר",
 "Nothing in here. Your trash bin is empty!" => "אין כאן שום דבר. סל המיחזור שלך ריק!",
 "Name" => "שם",
 "Restore" => "שחזור",
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
index aa8b45a7d6..69a2f5d5d4 100644
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ b/apps/files_trashbin/l10n/hu_HU.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nem sikerült %s végleges törlése",
 "Couldn't restore %s" => "Nem sikerült %s visszaállítása",
+"Deleted files" => "Törölt fájlok",
 "Error" => "Hiba",
 "restored" => "visszaállítva",
 "Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!",
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
index a55520fc11..11e1675074 100644
--- a/apps/files_trashbin/l10n/id.php
+++ b/apps/files_trashbin/l10n/id.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
 "Couldn't restore %s" => "Tidak dapat memulihkan %s",
+"Deleted files" => "Berkas yang dihapus",
 "Error" => "Galat",
 "Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
 "Name" => "Nama",
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
index b631e0c9e4..739dda2456 100644
--- a/apps/files_trashbin/l10n/it.php
+++ b/apps/files_trashbin/l10n/it.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Impossibile eliminare %s definitivamente",
 "Couldn't restore %s" => "Impossibile ripristinare %s",
+"Deleted files" => "File eliminati",
 "Error" => "Errore",
 "restored" => "ripristinati",
 "Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.",
diff --git a/apps/files_trashbin/l10n/ja.php b/apps/files_trashbin/l10n/ja.php
new file mode 100644
index 0000000000..0aab7d0575
--- /dev/null
+++ b/apps/files_trashbin/l10n/ja.php
@@ -0,0 +1,15 @@
+<?php
+$TRANSLATIONS = array(
+"Couldn't delete %s permanently" => "%s を完全に削除できませんでした",
+"Couldn't restore %s" => "%s を復元できませんでした",
+"Deleted files" => "ゴミ箱",
+"Error" => "エラー",
+"restored" => "復元済",
+"Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です！",
+"Name" => "名前",
+"Restore" => "復元",
+"Deleted" => "削除済み",
+"Delete" => "削除",
+"Deleted Files" => "ゴミ箱"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ja_JP.php b/apps/files_trashbin/l10n/ja_JP.php
index 8d896625b5..0aab7d0575 100644
--- a/apps/files_trashbin/l10n/ja_JP.php
+++ b/apps/files_trashbin/l10n/ja_JP.php
@@ -1,7 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s を完全に削除出来ませんでした",
-"Couldn't restore %s" => "%s を復元出来ませんでした",
+"Couldn't delete %s permanently" => "%s を完全に削除できませんでした",
+"Couldn't restore %s" => "%s を復元できませんでした",
+"Deleted files" => "ゴミ箱",
 "Error" => "エラー",
 "restored" => "復元済",
 "Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です！",
diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
index 7440171dee..f36bbea59b 100644
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ b/apps/files_trashbin/l10n/ka_GE.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა",
 "Couldn't restore %s" => "%s–ის აღდგენა ვერ მოხერხდა",
+"Deleted files" => "წაშლილი ფაილები",
 "Error" => "შეცდომა",
 "Nothing in here. Your trash bin is empty!" => "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!",
 "Name" => "სახელი",
diff --git a/apps/files_trashbin/l10n/km.php b/apps/files_trashbin/l10n/km.php
index f7d9faa38c..1df805de2d 100644
--- a/apps/files_trashbin/l10n/km.php
+++ b/apps/files_trashbin/l10n/km.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Error" => "កំហុស",
+"Name" => "ឈ្មោះ",
+"Restore" => "ស្ដារ​មក​វិញ",
 "Delete" => "លុប"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
index 9c3cd2de15..f95d143245 100644
--- a/apps/files_trashbin/l10n/ko.php
+++ b/apps/files_trashbin/l10n/ko.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s을(를_ 영구적으로 삭제할 수 없습니다",
 "Couldn't restore %s" => "%s을(를) 복원할 수 없습니다",
+"Deleted files" => "삭제된 파일",
 "Error" => "오류",
 "restored" => "복원됨",
 "Nothing in here. Your trash bin is empty!" => "휴지통이 비어 있습니다!",
diff --git a/apps/files_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
index c4a8463fd0..07325665d7 100644
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ b/apps/files_trashbin/l10n/lt_LT.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nepavyko negrįžtamai ištrinti %s",
 "Couldn't restore %s" => "Nepavyko atkurti %s",
+"Deleted files" => "Ištrinti failai",
 "Error" => "Klaida",
 "restored" => "atstatyta",
 "Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
diff --git a/apps/files_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
index 5c04a0c97d..d356b34437 100644
--- a/apps/files_trashbin/l10n/lv.php
+++ b/apps/files_trashbin/l10n/lv.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nevarēja pilnībā izdzēst %s",
 "Couldn't restore %s" => "Nevarēja atjaunot %s",
+"Deleted files" => "Dzēstās datnes",
 "Error" => "Kļūda",
 "restored" => "atjaunots",
 "Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!",
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
index 06a9dcfb24..f025a13db1 100644
--- a/apps/files_trashbin/l10n/mk.php
+++ b/apps/files_trashbin/l10n/mk.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Не можеше трајно да се избрише %s",
 "Couldn't restore %s" => "Не можеше да се поврати %s",
+"Deleted files" => "Избришани датотеки",
 "Error" => "Грешка",
 "restored" => "повратени",
 "Nothing in here. Your trash bin is empty!" => "Тука нема ништо. Вашата корпа за отпадоци е празна!",
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
index eb917e3dde..66e61ee72a 100644
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ b/apps/files_trashbin/l10n/nb_NO.php
@@ -2,12 +2,14 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunne ikke slette %s fullstendig",
 "Couldn't restore %s" => "Kunne ikke gjenopprette %s",
+"Deleted files" => "Slettede filer",
 "Error" => "Feil",
+"restored" => "gjenopprettet",
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
 "Name" => "Navn",
 "Restore" => "Gjenopprett",
 "Deleted" => "Slettet",
 "Delete" => "Slett",
-"Deleted Files" => "Slettet filer"
+"Deleted Files" => "Slettede filer"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
index 37a8ca6540..533571fd9e 100644
--- a/apps/files_trashbin/l10n/nl.php
+++ b/apps/files_trashbin/l10n/nl.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kon %s niet permanent verwijderen",
 "Couldn't restore %s" => "Kon %s niet herstellen",
+"Deleted files" => "Verwijderde bestanden",
 "Error" => "Fout",
 "restored" => "hersteld",
 "Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
index 39e2d5cda9..9282d9d49d 100644
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ b/apps/files_trashbin/l10n/nn_NO.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
 "Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
+"Deleted files" => "Sletta filer",
 "Error" => "Feil",
 "restored" => "gjenoppretta",
 "Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
diff --git a/apps/files_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
index 961b772782..5075dad271 100644
--- a/apps/files_trashbin/l10n/pl.php
+++ b/apps/files_trashbin/l10n/pl.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nie można trwale usunąć %s",
 "Couldn't restore %s" => "Nie można przywrócić %s",
+"Deleted files" => "Pliki usunięte",
 "Error" => "Błąd",
 "restored" => "przywrócony",
 "Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
index c2100efe96..300235452b 100644
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ b/apps/files_trashbin/l10n/pt_BR.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Não foi possível excluir %s permanentemente",
 "Couldn't restore %s" => "Não foi possível restaurar %s",
+"Deleted files" => "Arquivos apagados",
 "Error" => "Erro",
 "restored" => "restaurado",
 "Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
index 89e84a84d2..69f83e8a0e 100644
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ b/apps/files_trashbin/l10n/pt_PT.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Não foi possível eliminar %s de forma permanente",
 "Couldn't restore %s" => "Não foi possível restaurar %s",
+"Deleted files" => "Ficheiros eliminados",
 "Error" => "Erro",
 "restored" => "Restaurado",
 "Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index f285dcc164..b00f37615f 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Deleted files" => "Sterge fisierele",
 "Error" => "Eroare",
 "Name" => "Nume",
 "Delete" => "Șterge"
diff --git a/apps/files_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
index 06a4f864c6..3210ad7290 100644
--- a/apps/files_trashbin/l10n/ru.php
+++ b/apps/files_trashbin/l10n/ru.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s не может быть удалён навсегда",
 "Couldn't restore %s" => "%s не может быть восстановлен",
+"Deleted files" => "Удалённые файлы",
 "Error" => "Ошибка",
 "restored" => "восстановлен",
 "Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
diff --git a/apps/files_trashbin/l10n/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
index b23383c121..6bb39bb89d 100644
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ b/apps/files_trashbin/l10n/sk_SK.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nemožno zmazať %s navždy",
 "Couldn't restore %s" => "Nemožno obnoviť %s",
+"Deleted files" => "Zmazané súbory",
 "Error" => "Chyba",
 "restored" => "obnovené",
 "Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!",
diff --git a/apps/files_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
index 9f164ae709..ca69c8d278 100644
--- a/apps/files_trashbin/l10n/sl.php
+++ b/apps/files_trashbin/l10n/sl.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Datoteke %s ni mogoče trajno izbrisati.",
 "Couldn't restore %s" => "Ni mogoče obnoviti %s",
+"Deleted files" => "Izbrisane datoteke",
 "Error" => "Napaka",
 "restored" => "obnovljeno",
 "Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.",
diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php
index 63957080f3..10354e4540 100644
--- a/apps/files_trashbin/l10n/sq.php
+++ b/apps/files_trashbin/l10n/sq.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Nuk munda ta eliminoj përfundimisht %s",
 "Couldn't restore %s" => "Nuk munda ta rivendos %s",
+"Deleted files" => "Skedarë të fshirë ",
 "Error" => "Veprim i gabuar",
 "restored" => "rivendosur",
 "Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!",
diff --git a/apps/files_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
index c893dba118..7fb4c85ab6 100644
--- a/apps/files_trashbin/l10n/sr.php
+++ b/apps/files_trashbin/l10n/sr.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Deleted files" => "Обрисане датотеке",
 "Error" => "Грешка",
 "Nothing in here. Your trash bin is empty!" => "Овде нема ништа. Корпа за отпатке је празна.",
 "Name" => "Име",
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
index 21d4d15e9c..ec9de3acaa 100644
--- a/apps/files_trashbin/l10n/sv.php
+++ b/apps/files_trashbin/l10n/sv.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Kunde inte radera %s permanent",
 "Couldn't restore %s" => "Kunde inte återställa %s",
+"Deleted files" => "Raderade filer",
 "Error" => "Fel",
 "restored" => "återställd",
 "Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
index 00a3b4d32a..c1234cdfb0 100644
--- a/apps/files_trashbin/l10n/tr.php
+++ b/apps/files_trashbin/l10n/tr.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "%s alıcı olarak silinemedi",
 "Couldn't restore %s" => "%s eri yüklenemedi",
+"Deleted files" => "Silinmiş dosyalar",
 "Error" => "Hata",
 "restored" => "geri yüklendi",
 "Nothing in here. Your trash bin is empty!" => "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!",
diff --git a/apps/files_trashbin/l10n/ug.php b/apps/files_trashbin/l10n/ug.php
index 54c040c88a..f52f28db49 100644
--- a/apps/files_trashbin/l10n/ug.php
+++ b/apps/files_trashbin/l10n/ug.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Deleted files" => "ئۆچۈرۈلگەن ھۆججەتلەر",
 "Error" => "خاتالىق",
 "Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
 "Name" => "ئاتى",
diff --git a/apps/files_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
index c54d45aaa8..19d4bda97c 100644
--- a/apps/files_trashbin/l10n/uk.php
+++ b/apps/files_trashbin/l10n/uk.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "Неможливо видалити %s назавжди",
 "Couldn't restore %s" => "Неможливо відновити %s",
+"Deleted files" => "Видалено файлів",
 "Error" => "Помилка",
 "restored" => "відновлено",
 "Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!",
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
index c5e899392b..81a0cf14bc 100644
--- a/apps/files_trashbin/l10n/vi.php
+++ b/apps/files_trashbin/l10n/vi.php
@@ -1,8 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Không thể óa %s vĩnh viễn",
+"Couldn't delete %s permanently" => "Không thể xóa %s vĩnh viễn",
 "Couldn't restore %s" => "Không thể khôi phục %s",
+"Deleted files" => "File đã bị xóa",
 "Error" => "Lỗi",
+"restored" => "khôi phục",
 "Nothing in here. Your trash bin is empty!" => "Không có gì ở đây. Thùng rác của bạn rỗng!",
 "Name" => "Tên",
 "Restore" => "Khôi phục",
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
index 24d9002adc..4c61aef33b 100644
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ b/apps/files_trashbin/l10n/zh_CN.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "无法彻底删除文件%s",
 "Couldn't restore %s" => "无法恢复%s",
+"Deleted files" => "已删除文件",
 "Error" => "错误",
 "restored" => "已恢复",
 "Nothing in here. Your trash bin is empty!" => "这里没有东西. 你的回收站是空的!",
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
index 1f05a2687b..65b954e2c6 100644
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ b/apps/files_trashbin/l10n/zh_TW.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Couldn't delete %s permanently" => "無法永久刪除 %s",
 "Couldn't restore %s" => "無法還原 %s",
+"Deleted files" => "回收桶",
 "Error" => "錯誤",
 "restored" => "已還原",
 "Nothing in here. Your trash bin is empty!" => "您的回收桶是空的！",
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index c454b35a5f..9c24332a96 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -2,55 +2,67 @@
 
 namespace OCA\Files_Trashbin;
 
+use OC\Files\FileInfo;
+
 class Helper
 {
 	/**
 	 * Retrieves the contents of a trash bin directory.
 	 * @param string $dir path to the directory inside the trashbin
 	 * or empty to retrieve the root of the trashbin
-	 * @return array of files
+	 * @return \OCP\Files\FileInfo[]
 	 */
 	public static function getTrashFiles($dir){
 		$result = array();
+		$timestamp = null;
 		$user = \OCP\User::getUser();
 
-		if ($dir && $dir !== '/') {
-			$view = new \OC_Filesystemview('/'.$user.'/files_trashbin/files');
-			$dirContent = $view->opendir($dir);
-			if ($dirContent === false){
-				return null;
-			}
-			if(is_resource($dirContent)){
-				while(($entryName = readdir($dirContent)) !== false) {
-					if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
-						$pos = strpos($dir.'/', '/', 1);
-						$tmp = substr($dir, 0, $pos);
-						$pos = strrpos($tmp, '.d');
-						$timestamp = substr($tmp, $pos+2);
-						$result[] = array(
-								'id' => $entryName,
-								'timestamp' => $timestamp,
-								'mime' =>  $view->getMimeType($dir.'/'.$entryName),
-								'type' => $view->is_dir($dir.'/'.$entryName) ? 'dir' : 'file',
-								'location' => $dir,
-								);
+		$view = new \OC_Filesystemview('/' . $user . '/files_trashbin/files');
+
+		if (ltrim($dir, '/') !== '' && !$view->is_dir($dir)) {
+			throw new \Exception('Directory does not exists');
+		}
+
+		$dirContent = $view->opendir($dir);
+		if ($dirContent === false) {
+			return $result;
+		}
+		if (is_resource($dirContent)) {
+			while (($entryName = readdir($dirContent)) !== false) {
+				if (!\OC\Files\Filesystem::isIgnoredDir($entryName)) {
+					$id = $entryName;
+					if ($dir === '' || $dir === '/') {
+						$pathparts = pathinfo($entryName);
+						$timestamp = substr($pathparts['extension'], 1);
+						$id = $pathparts['filename'];
+					} else if ($timestamp === null) {
+						// for subfolders we need to calculate the timestamp only once
+						$parts = explode('/', ltrim($dir, '/'));
+						$timestamp = substr(pathinfo($parts[0], PATHINFO_EXTENSION), 1);
 					}
+					$result[] = array(
+						'id' => $id,
+						'timestamp' => $timestamp,
+						'mime' => \OC_Helper::getFileNameMimeType($id),
+						'type' => $view->is_dir($dir . '/' . $entryName) ? 'dir' : 'file',
+						'location' => $dir,
+					);
 				}
-				closedir($dirContent);
 			}
-		} else {
-			$query = \OC_DB::prepare('SELECT `id`,`location`,`timestamp`,`type`,`mime` FROM `*PREFIX*files_trash` WHERE `user` = ?');
-			$result = $query->execute(array($user))->fetchAll();
+			closedir($dirContent);
 		}
 
 		$files = array();
 		$id = 0;
+		list($storage, $internalPath) = $view->resolvePath($dir);
+		$absoluteDir = $view->getAbsolutePath($dir);
 		foreach ($result as $r) {
 			$i = array();
 			$i['id'] = $id++;
 			$i['name'] = $r['id'];
 			$i['date'] = \OCP\Util::formatDate($r['timestamp']);
 			$i['timestamp'] = $r['timestamp'];
+			$i['etag'] = $r['timestamp']; // add fake etag, it is only needed to identify the preview image
 			$i['mimetype'] = $r['mime'];
 			$i['type'] = $r['type'];
 			if ($i['type'] === 'file') {
@@ -63,9 +75,13 @@ class Helper
 				$i['directory'] = '';
 			}
 			$i['permissions'] = \OCP\PERMISSION_READ;
-			$i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($r['mime']);
+			if (\OCP\App::isEnabled('files_encryption')) {
+				$i['isPreviewAvailable'] = false;
+			} else {
+				$i['isPreviewAvailable'] = \OC::$server->getPreviewManager()->isMimeSupported($r['mime']);
+			}
 			$i['icon'] = \OCA\Files\Helper::determineIcon($i);
-			$files[] = $i;
+			$files[] = new FileInfo($absoluteDir . '/' . $i['name'], $storage, $internalPath . '/' . $i['name'], $i);
 		}
 
 		usort($files, array('\OCA\Files\Helper', 'fileCmp'));
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index bc77e9c154..7b14a4ec08 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -62,11 +62,13 @@ class Trashbin {
 
 
 	/**
+	 * @brief copy file to owners trash
+	 * @param string $sourcePath
 	 * @param string $owner
+	 * @param string $ownerPath
 	 * @param integer $timestamp
-	 * @param string $type
 	 */
-	private static function copyFilesToOwner($sourcePath, $owner, $ownerPath, $timestamp, $type, $mime) {
+	private static function copyFilesToOwner($sourcePath, $owner, $ownerPath, $timestamp) {
 		self::setUpTrash($owner);
 
 		$ownerFilename = basename($ownerPath);
@@ -76,18 +78,16 @@ class Trashbin {
 
 		$view = new \OC\Files\View('/');
 
-		$source = \OCP\User::getUser().'/files_trashbin/files/' . $sourceFilename . '.d' . $timestamp;
-		$target = $owner.'/files_trashbin/files/' . $ownerFilename . '.d' . $timestamp;
+		$source = \OCP\User::getUser() . '/files_trashbin/files/' . $sourceFilename . '.d' . $timestamp;
+		$target = $owner . '/files_trashbin/files/' . $ownerFilename . '.d' . $timestamp;
 		self::copy_recursive($source, $target, $view);
 
 
 		if ($view->file_exists($target)) {
-			$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)");
-			$result = $query->execute(array($ownerFilename, $timestamp, $ownerLocation, $type, $mime, $owner));
-			if (!$result) { // if file couldn't be added to the database than also don't store it in the trash bin.
-				$view->deleteAll($owner.'/files_trashbin/files/' . $ownerFilename . '.d' . $timestamp);
+			$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)");
+			$result = $query->execute(array($ownerFilename, $timestamp, $ownerLocation, $owner));
+			if (!$result) {
 				\OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated for the files owner', \OC_log::ERROR);
-				return;
 			}
 		}
 	}
@@ -110,34 +110,22 @@ class Trashbin {
 		$filename = $path_parts['basename'];
 		$location = $path_parts['dirname'];
 		$timestamp = time();
-		$mime = $view->getMimeType('files' . $file_path);
-
-		if ($view->is_dir('files' . $file_path)) {
-			$type = 'dir';
-		} else {
-			$type = 'file';
-		}
 
 		$userTrashSize = self::getTrashbinSize($user);
-		if ($userTrashSize === false || $userTrashSize < 0) {
-			$userTrashSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
-		}
 
 		// disable proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
 		\OC_FileProxy::$enabled = false;
 		$trashPath = '/files_trashbin/files/' . $filename . '.d' . $timestamp;
-		$sizeOfAddedFiles = self::copy_recursive('/files/'.$file_path, $trashPath, $view);
+		$sizeOfAddedFiles = self::copy_recursive('/files/' . $file_path, $trashPath, $view);
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		if ($view->file_exists('files_trashbin/files/' . $filename . '.d' . $timestamp)) {
 			$size = $sizeOfAddedFiles;
-			$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`type`,`mime`,`user`) VALUES (?,?,?,?,?,?)");
-			$result = $query->execute(array($filename, $timestamp, $location, $type, $mime, $user));
-			if (!$result) { // if file couldn't be added to the database than also don't store it in the trash bin.
-				$view->deleteAll('files_trashbin/files/' . $filename . '.d' . $timestamp);
+			$query = \OC_DB::prepare("INSERT INTO `*PREFIX*files_trash` (`id`,`timestamp`,`location`,`user`) VALUES (?,?,?,?)");
+			$result = $query->execute(array($filename, $timestamp, $location, $user));
+			if (!$result) {
 				\OC_Log::write('files_trashbin', 'trash bin database couldn\'t be updated', \OC_log::ERROR);
-				return;
 			}
 			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_moveToTrash', array('filePath' => \OC\Files\Filesystem::normalizePath($file_path),
 				'trashPath' => \OC\Files\Filesystem::normalizePath($filename . '.d' . $timestamp)));
@@ -147,7 +135,7 @@ class Trashbin {
 
 			// if owner !== user we need to also add a copy to the owners trash
 			if ($user !== $owner) {
-				self::copyFilesToOwner($file_path, $owner, $ownerPath, $timestamp, $type, $mime);
+				self::copyFilesToOwner($file_path, $owner, $ownerPath, $timestamp);
 			}
 		} else {
 			\OC_Log::write('files_trashbin', 'Couldn\'t move ' . $file_path . ' to the trash bin', \OC_log::ERROR);
@@ -155,17 +143,12 @@ class Trashbin {
 
 		$userTrashSize += $size;
 		$userTrashSize -= self::expire($userTrashSize, $user);
-		self::setTrashbinSize($user, $userTrashSize);
 
 		// if owner !== user we also need to update the owners trash size
-		if($owner !== $user) {
+		if ($owner !== $user) {
 			$ownerTrashSize = self::getTrashbinSize($owner);
-			if ($ownerTrashSize === false || $ownerTrashSize < 0) {
-				$ownerTrashSize = self::calculateSize(new \OC\Files\View('/' . $owner . '/files_trashbin'));
-			}
 			$ownerTrashSize += $size;
 			$ownerTrashSize -= self::expire($ownerTrashSize, $owner);
-			self::setTrashbinSize($owner, $ownerTrashSize);
 		}
 	}
 
@@ -315,6 +298,7 @@ class Trashbin {
 
 	/**
 	 * restore files from trash bin
+	 *
 	 * @param $file path to the deleted file
 	 * @param $filename name of the file
 	 * @param $timestamp time when the file was deleted
@@ -326,33 +310,23 @@ class Trashbin {
 		$user = \OCP\User::getUser();
 		$view = new \OC\Files\View('/' . $user);
 
-		$trashbinSize = self::getTrashbinSize($user);
-		if ($trashbinSize === false || $trashbinSize < 0) {
-			$trashbinSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
-		}
+		$location = '';
 		if ($timestamp) {
-			$query = \OC_DB::prepare('SELECT `location`,`type` FROM `*PREFIX*files_trash`'
-					. ' WHERE `user`=? AND `id`=? AND `timestamp`=?');
+			$query = \OC_DB::prepare('SELECT `location` FROM `*PREFIX*files_trash`'
+				. ' WHERE `user`=? AND `id`=? AND `timestamp`=?');
 			$result = $query->execute(array($user, $filename, $timestamp))->fetchAll();
 			if (count($result) !== 1) {
 				\OC_Log::write('files_trashbin', 'trash bin database inconsistent!', \OC_Log::ERROR);
-				return false;
+			} else {
+				$location = $result[0]['location'];
+				// if location no longer exists, restore file in the root directory
+				if ($location !== '/' &&
+					(!$view->is_dir('files' . $location) ||
+						!$view->isUpdatable('files' . $location))
+				) {
+					$location = '';
+				}
 			}
-
-			// if location no longer exists, restore file in the root directory
-			$location = $result[0]['location'];
-			if ($result[0]['location'] !== '/' &&
-				(!$view->is_dir('files' . $result[0]['location']) ||
-				!$view->isUpdatable('files' . $result[0]['location']))) {
-				$location = '';
-			}
-		} else {
-			$path_parts = pathinfo($file);
-			$result[] = array(
-				'location' => $path_parts['dirname'],
-				'type' => $view->is_dir('/files_trashbin/files/' . $file) ? 'dir' : 'files',
-			);
-			$location = '';
 		}
 
 		// we need a  extension in case a file/dir with the same name already exists
@@ -377,22 +351,15 @@ class Trashbin {
 			$view->chroot($fakeRoot);
 			\OCP\Util::emitHook('\OCA\Files_Trashbin\Trashbin', 'post_restore', array('filePath' => \OC\Files\Filesystem::normalizePath('/' . $location . '/' . $uniqueFilename),
 				'trashPath' => \OC\Files\Filesystem::normalizePath($file)));
-			if ($view->is_dir($target)) {
-				$trashbinSize -= self::calculateSize(new \OC\Files\View('/' . $user . '/' . $target));
-			} else {
-				$trashbinSize -= $view->filesize($target);
-			}
 
-			$trashbinSize -= self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp);
-			$trashbinSize -= self::restoreEncryptionKeys($view, $file, $filename, $uniqueFilename, $location, $timestamp);
+			self::restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp);
+			self::restoreEncryptionKeys($view, $file, $filename, $uniqueFilename, $location, $timestamp);
 
 			if ($timestamp) {
 				$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
 				$query->execute(array($user, $filename, $timestamp));
 			}
 
-			self::setTrashbinSize($user, $trashbinSize);
-
 			// enable proxy
 			\OC_FileProxy::$enabled = $proxyStatus;
 
@@ -415,10 +382,8 @@ class Trashbin {
 	 * @param $location location if file
 	 * @param $timestamp deleteion time
 	 *
-	 * @return size of restored versions
 	 */
 	private static function restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
-		$size = 0;
 
 		if (\OCP\App::isEnabled('files_versions')) {
 			// disable proxy to prevent recursive calls
@@ -439,15 +404,12 @@ class Trashbin {
 			}
 
 			if ($view->is_dir('/files_trashbin/versions/' . $file)) {
-				$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . 'files_trashbin/versions/' . $file));
 				$rootView->rename(\OC\Files\Filesystem::normalizePath($user . '/files_trashbin/versions/' . $file), \OC\Files\Filesystem::normalizePath($owner . '/files_versions/' . $ownerPath));
 			} else if ($versions = self::getVersionsFromTrash($versionedFile, $timestamp)) {
 				foreach ($versions as $v) {
 					if ($timestamp) {
-						$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp);
 						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v . '.d' . $timestamp, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
 					} else {
-						$size += $view->filesize('files_trashbin/versions/' . $versionedFile . '.v' . $v);
 						$rootView->rename($user . '/files_trashbin/versions/' . $versionedFile . '.v' . $v, $owner . '/files_versions/' . $ownerPath . '.v' . $v);
 					}
 				}
@@ -456,7 +418,6 @@ class Trashbin {
 			// enable proxy
 			\OC_FileProxy::$enabled = $proxyStatus;
 		}
-		return $size;
 	}
 
 	/**
@@ -469,11 +430,9 @@ class Trashbin {
 	 * @param $location location of file
 	 * @param $timestamp deleteion time
 	 *
-	 * @return size of restored encrypted file
 	 */
 	private static function restoreEncryptionKeys($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
 		// Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
-		$size = 0;
 		if (\OCP\App::isEnabled('files_encryption')) {
 			$user = \OCP\User::getUser();
 			$rootView = new \OC\Files\View('/');
@@ -518,18 +477,15 @@ class Trashbin {
 				if ($rootView->is_dir($keyfile)) {
 
 					// handle keyfiles
-					$size += self::calculateSize(new \OC\Files\View($keyfile));
 					$rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath);
 
 					// handle share-keys
 					if ($timestamp) {
 						$sharekey .= '.d' . $timestamp;
 					}
-					$size += self::calculateSize(new \OC\Files\View($sharekey));
 					$rootView->rename($sharekey, $baseDir . '/share-keys/' . $ownerPath);
 				} else {
 					// handle keyfiles
-					$size += $rootView->filesize($keyfile);
 					$rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath . '.key');
 
 					// handle share-keys
@@ -538,8 +494,6 @@ class Trashbin {
 						$ownerShareKey .= '.d' . $timestamp;
 					}
 
-					$size += $rootView->filesize($ownerShareKey);
-
 					// move only owners key
 					$rootView->rename($ownerShareKey, $baseDir . '/share-keys/' . $ownerPath . '.' . $user . '.shareKey');
 
@@ -566,7 +520,6 @@ class Trashbin {
 			// enable proxy
 			\OC_FileProxy::$enabled = $proxyStatus;
 		}
-		return $size;
 	}
 
 	/**
@@ -576,7 +529,6 @@ class Trashbin {
 		$user = \OCP\User::getUser();
 		$view = new \OC\Files\View('/' . $user);
 		$view->deleteAll('files_trashbin');
-		self::setTrashbinSize($user, 0);
 		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=?');
 		$query->execute(array($user));
 
@@ -597,11 +549,6 @@ class Trashbin {
 		$view = new \OC\Files\View('/' . $user);
 		$size = 0;
 
-		$trashbinSize = self::getTrashbinSize($user);
-		if ($trashbinSize === false || $trashbinSize < 0) {
-			$trashbinSize = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
-		}
-
 		if ($timestamp) {
 			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*files_trash` WHERE `user`=? AND `id`=? AND `timestamp`=?');
 			$query->execute(array($user, $filename, $timestamp));
@@ -618,10 +565,9 @@ class Trashbin {
 		} else {
 			$size += $view->filesize('/files_trashbin/files/' . $file);
 		}
+		\OC_Hook::emit('\OCP\Trashbin', 'preDelete', array('path' => '/files_trashbin/files/' . $file));
 		$view->unlink('/files_trashbin/files/' . $file);
 		\OC_Hook::emit('\OCP\Trashbin', 'delete', array('path' => '/files_trashbin/files/' . $file));
-		$trashbinSize -= $size;
-		self::setTrashbinSize($user, $trashbinSize);
 
 		return $size;
 	}
@@ -687,6 +633,7 @@ class Trashbin {
 
 	/**
 	 * check to see whether a file exists in trashbin
+	 *
 	 * @param $filename path to the file
 	 * @param $timestamp of deletion time
 	 * @return true if file exists, otherwise false
@@ -767,22 +714,16 @@ class Trashbin {
 
 		$size = self::getTrashbinSize($user);
 
-		if ($size === false || $size < 0) {
-			$size = self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin'));
-		}
-
 		$freeSpace = self::calculateFreeSpace($size);
 
 		if ($freeSpace < 0) {
-			$newSize = $size - self::expire($size, $user);
-			if ($newSize !== $size) {
-				self::setTrashbinSize($user, $newSize);
-			}
+			self::expire($size, $user);
 		}
 	}
 
 	/**
 	 * clean up the trash bin
+	 *
 	 * @param int $trashbinSize current size of the trash bin
 	 * @param string $user
 	 * @return int size of expired files
@@ -818,7 +759,7 @@ class Trashbin {
 		// if size limit for trash bin reached, delete oldest files in trash bin
 		if ($availableSpace < 0) {
 			$query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash`'
-					. ' WHERE `user`=? ORDER BY `timestamp` ASC');
+				. ' WHERE `user`=? ORDER BY `timestamp` ASC');
 			$result = $query->execute(array($user))->fetchAll();
 			$length = count($result);
 			$i = 0;
@@ -866,6 +807,7 @@ class Trashbin {
 
 	/**
 	 * find all versions which belong to the file we want to restore
+	 *
 	 * @param $filename name of the file which should be restored
 	 * @param $timestamp timestamp when the file was deleted
 	 */
@@ -885,10 +827,10 @@ class Trashbin {
 		foreach ($matches as $ma) {
 			if ($timestamp) {
 				$parts = explode('.v', substr($ma, 0, $offset));
-				$versions[] = ( end($parts) );
+				$versions[] = (end($parts));
 			} else {
 				$parts = explode('.v', $ma);
-				$versions[] = ( end($parts) );
+				$versions[] = (end($parts));
 			}
 		}
 		return $versions;
@@ -896,6 +838,7 @@ class Trashbin {
 
 	/**
 	 * find unique extension for restored file if a file with the same name already exists
+	 *
 	 * @param $location where the file should be restored
 	 * @param $filename name of the file
 	 * @param \OC\Files\View $view filesystem view relative to users root directory
@@ -913,9 +856,9 @@ class Trashbin {
 
 		if ($view->file_exists('files' . $location . '/' . $filename)) {
 			$i = 2;
-			$uniqueName = $name . " (".$l->t("restored").")". $ext;
+			$uniqueName = $name . " (" . $l->t("restored") . ")" . $ext;
 			while ($view->file_exists('files' . $location . '/' . $uniqueName)) {
-				$uniqueName = $name . " (".$l->t("restored") . " " . $i . ")" . $ext;
+				$uniqueName = $name . " (" . $l->t("restored") . " " . $i . ")" . $ext;
 				$i++;
 			}
 
@@ -954,28 +897,9 @@ class Trashbin {
 	 * @return mixed trash bin size or false if no trash bin size is stored
 	 */
 	private static function getTrashbinSize($user) {
-		$query = \OC_DB::prepare('SELECT `size` FROM `*PREFIX*files_trashsize` WHERE `user`=?');
-		$result = $query->execute(array($user))->fetchAll();
-
-		if ($result) {
-			return (int)$result[0]['size'];
-		}
-		return false;
-	}
-
-	/**
-	 * write to the database how much space is in use for the trash bin
-	 *
-	 * @param $user owner of the trash bin
-	 * @param $size size of the trash bin
-	 */
-	private static function setTrashbinSize($user, $size) {
-		if (self::getTrashbinSize($user) === false) {
-			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*files_trashsize` (`size`, `user`) VALUES (?, ?)');
-		} else {
-			$query = \OC_DB::prepare('UPDATE `*PREFIX*files_trashsize` SET `size`=? WHERE `user`=?');
-		}
-		$query->execute(array($size, $user));
+		$view = new \OC\Files\View('/' . $user);
+		$fileInfo = $view->getFileInfo('/files_trashbin');
+		return $fileInfo['size'];
 	}
 
 	/**
@@ -997,16 +921,19 @@ class Trashbin {
 	public static function isEmpty($user) {
 
 		$view = new \OC\Files\View('/' . $user . '/files_trashbin');
-		$content = $view->getDirectoryContent('/files');
-
-		if ($content) {
+		$dh = $view->opendir('/files');
+		if (!$dh) {
 			return false;
 		}
-
+		while ($file = readdir($dh)) {
+			if ($file !== '.' and $file !== '..') {
+				return false;
+			}
+		}
 		return true;
 	}
 
 	public static function preview_icon($path) {
-		return \OC_Helper::linkToRoute( 'core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => $path ));
+		return \OC_Helper::linkToRoute('core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => $path));
 	}
 }
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 661d64aa97..a735caee94 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -9,7 +9,7 @@
 	<description>
 	ownCloud supports simple version control for files.	The versioning app
 	expires old versions automatically to make sure that
-	the user doesn't run out of space. Following pattern is used to delete
+	the user doesn't run out of space. The following pattern is used to delete
 	old versions:
 	For the first 10 seconds ownCloud keeps one version every 2 seconds;
 	For the first hour ownCloud keeps one version every minute;
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 4adf14745d..b452bc25b1 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -11,7 +11,7 @@ $(document).ready(function(){
 		// Add versions button to 'files/index.php'
 		FileActions.register(
 			'file'
-			, t('files_versions', 'Versions')
+			, 'Versions'
 			, OC.PERMISSION_UPDATE
 			, function() {
 				// Specify icon for hitory button
@@ -36,6 +36,7 @@ $(document).ready(function(){
 					createVersionsDropdown(filename, file);
 				}
 			}
+			, t('files_versions', 'Versions')
 		);
 	}
 
diff --git a/apps/files_versions/l10n/ja.php b/apps/files_versions/l10n/ja.php
new file mode 100644
index 0000000000..ec2601aafb
--- /dev/null
+++ b/apps/files_versions/l10n/ja.php
@@ -0,0 +1,10 @@
+<?php
+$TRANSLATIONS = array(
+"Could not revert: %s" => "元に戻せませんでした: %s",
+"Versions" => "バージョン",
+"Failed to revert {file} to revision {timestamp}." => "{file} を {timestamp} のリヴィジョンに戻すことができません。",
+"More versions..." => "もっと他のバージョン...",
+"No other versions available" => "利用可能な他のバージョンはありません",
+"Restore" => "復元"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/km.php b/apps/files_versions/l10n/km.php
new file mode 100644
index 0000000000..3673d002a7
--- /dev/null
+++ b/apps/files_versions/l10n/km.php
@@ -0,0 +1,10 @@
+<?php
+$TRANSLATIONS = array(
+"Could not revert: %s" => "មិន​អាច​ត្រឡប់៖ %s",
+"Versions" => "កំណែ",
+"Failed to revert {file} to revision {timestamp}." => "មិន​អាច​ត្រឡប់ {file} ទៅ​កំណែ​សម្រួល {timestamp} បាន​ទេ។",
+"More versions..." => "កំណែ​ច្រើន​ទៀត...",
+"No other versions available" => "មិន​មាន​កំណែ​ផ្សេង​ទៀត​ទេ",
+"Restore" => "ស្ដារ​មក​វិញ"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index 2a0a6d8a76..4c0c8c65ba 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,6 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Could not revert: %s" => "Klarte ikke å tilbakeføre: %s",
 "Versions" => "Versjoner",
+"Failed to revert {file} to revision {timestamp}." => "Klarte ikke å tilbakeføre {file} til revisjon {timestamp}.",
+"More versions..." => "Flere versjoner",
+"No other versions available" => "Det finnes ingen andre versjoner",
 "Restore" => "Gjenopprett"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/sq.php b/apps/files_versions/l10n/sq.php
index 5a7a23a217..e8a0e79748 100644
--- a/apps/files_versions/l10n/sq.php
+++ b/apps/files_versions/l10n/sq.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Could not revert: %s" => "Nuk mund të ktheje: %s",
+"Versions" => "Versioni",
+"Failed to revert {file} to revision {timestamp}." => "Dështoi në ktheje {skedar} të rishikimit {kohëstampe}.",
+"More versions..." => "Versione m'shumë...",
+"No other versions available" => "Nuk ka versione të tjera në dispozicion",
 "Restore" => "Rivendos"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index 9d72612c2a..a6f515ed0a 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -2,6 +2,9 @@
 $TRANSLATIONS = array(
 "Could not revert: %s" => "Không thể khôi phục: %s",
 "Versions" => "Phiên bản",
+"Failed to revert {file} to revision {timestamp}." => "Thất bại khi trở lại {file} khi sử đổi {timestamp}.",
+"More versions..." => "Nhiều phiên bản ...",
+"No other versions available" => "Không có các phiên bản khác có sẵn",
 "Restore" => "Khôi phục"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php
index 767ca1cf64..279ec2eff8 100644
--- a/apps/files_versions/l10n/zh_CN.php
+++ b/apps/files_versions/l10n/zh_CN.php
@@ -2,6 +2,9 @@
 $TRANSLATIONS = array(
 "Could not revert: %s" => "无法恢复: %s",
 "Versions" => "版本",
+"Failed to revert {file} to revision {timestamp}." => "无法恢复 {file} 到 {timestamp} 的版本。",
+"More versions..." => "更多版本...",
+"No other versions available" => "无其他版本可用",
 "Restore" => "恢复"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 2bd9c15bae..290264a90c 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -178,6 +178,7 @@ class Storage {
 					$versionsSize = self::calculateSize($uid);
 				}
 				foreach ($versions as $v) {
+					\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $abs_path . $v['version']));
 					unlink($abs_path . $v['version']);
 					\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $abs_path . $v['version']));
 					$versionsSize -= $v['size'];
@@ -542,8 +543,9 @@ class Storage {
 			}
 
 			foreach($toDelete as $key => $path) {
-				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path));
+				\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $path));
 				$versionsFileview->unlink($path);
+				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $path));
 				unset($allVersions[$key]); // update array with the versions we keep
 				\OCP\Util::writeLog('files_versions', "Expire: " . $path, \OCP\Util::DEBUG);
 			}
@@ -555,6 +557,7 @@ class Storage {
 			$i = 0;
 			while ($availableSpace < 0 && $i < $numOfVersions) {
 				$version = current($allVersions);
+				\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version']));
 				$versionsFileview->unlink($version['path'].'.v'.$version['version']);
 				\OC_Hook::emit('\OCP\Versions', 'delete', array('path' => $version['path'].'.v'.$version['version']));
 				\OCP\Util::writeLog('files_versions', 'running out of space! Delete oldest version: ' . $version['path'].'.v'.$version['version'] , \OCP\Util::DEBUG);
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 9cc908e852..e4a4375a73 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -2,8 +2,8 @@
 <info>
 	<id>user_ldap</id>
 	<name>LDAP user and group backend</name>
-	<description>Authenticate users and groups by LDAP respectively Active
-		Directory.
+	<description>Authenticate users and groups through LDAP, such as OpenLDAP
+	    or Active Directory.
 
 		This app is not compatible with the WebDAV user backend.
 	</description>
diff --git a/apps/user_ldap/l10n/am_ET.php b/apps/user_ldap/l10n/am_ET.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/am_ET.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index 2b0cbbd75a..a2152dde85 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,6 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "تعذر حذف ملف إعدادات الخادم",
+"The configuration is valid and the connection could be established!" => "الإعدادت صحيحة",
 "Deletion failed" => "فشل الحذف",
+"Success" => "نجاح",
 "Error" => "خطأ",
 "Select groups" => "إختر مجموعة",
 "_%s group found_::_%s groups found_" => array("","","","","",""),
@@ -8,7 +11,9 @@ $TRANSLATIONS = array(
 "Save" => "حفظ",
 "Help" => "المساعدة",
 "Host" => "المضيف",
+"Port" => "المنفذ",
 "Password" => "كلمة المرور",
-"Back" => "رجوع"
+"Back" => "رجوع",
+"Email Field" => "خانة البريد الإلكتروني"
 );
 $PLURAL_FORMS = "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;";
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 2ebaa7d7a5..940c6ea8b6 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Desa",
 "Test Configuration" => "Comprovació de la configuració",
 "Help" => "Ajuda",
-"Limit the access to %s to groups meeting this criteria:" => "Limita l'accés a %s grups que compleixin amb el criteri:",
+"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",
-"What attribute shall be used as login name:" => "Quin atribut s'hauria d'utilitzar com a nom per a l'acreditació:",
+"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:",
@@ -55,7 +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 the access to %s to users meeting this criteria:" => "Limita l'accés a %s usuaris que compleixin amb el criteri:",
+"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",
@@ -88,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/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 6bcf364ab3..536834ee8b 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Uložit",
 "Test Configuration" => "Vyzkoušet nastavení",
 "Help" => "Nápověda",
-"Limit the access to %s to groups meeting this criteria:" => "Omezit přístup k %s skupinám uživatelů splňujícím tyto podmínky:",
+"Groups meeting these criteria are available in %s:" => "Skupiny splňující tyto podmínky jsou k dispozici v %s:",
 "only those object classes:" => "pouze tyto objektové třídy:",
 "only from those groups:" => "pouze z těchto skupin:",
 "Edit raw filter instead" => "Edituj filtr přímo",
 "Raw LDAP filter" => "Původní filtr LDAP",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
 "groups found" => "nalezené skupiny",
-"What attribute shall be used as login name:" => "Který atribut má být použit jako přihlašovací jméno:",
+"Users login with this attribute:" => "Uživatelé se přihlašují s tímto atributem:",
 "LDAP Username:" => "LDAP uživatelské jméno:",
 "LDAP Email Address:" => "LDAP e-mailová adresa:",
 "Other Attributes:" => "Další atributy:",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.",
 "One Base DN per line" => "Jedna základní DN na řádku",
 "You can specify Base DN for users and groups in the Advanced tab" => "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny",
-"Limit the access to %s to users meeting this criteria:" => "Omezit přístup k %s uživatelům splňujícím tyto podmínky:",
+"Limit %s access to users meeting these criteria:" => "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
 "users found" => "nalezení uživatelé",
 "Back" => "Zpět",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Jedna skupinová základní DN na řádku",
 "Group Search Attributes" => "Atributy vyhledávání skupin",
 "Group-Member association" => "Asociace člena skupiny",
+"Nested Groups" => "Vnořené skupiny",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Pokud zapnuto, je možno používat skupiny, které obsahují jiné skupiny. (Funguje pouze pokud atribut člena skupiny obsahuje DN.)",
 "Special Attributes" => "Speciální atributy",
 "Quota Field" => "Pole pro kvótu",
 "Quota Default" => "Výchozí kvóta",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 0c80ecfa85..8dad9b3453 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Speichern",
 "Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe",
-"Limit the access to %s to groups meeting this criteria:" => "Beschränke den Zugriff auf %s auf Gruppen, die die folgenden Kriterien erfüllen:",
+"Groups meeting these criteria are available in %s:" => "Gruppen-Versammlungen mit diesen Kriterien sind verfügbar in %s:",
 "only those object classes:" => "Nur diese Objekt-Klassen:",
 "only from those groups:" => "Nur von diesen Gruppen:",
 "Edit raw filter instead" => "Original-Filter stattdessen bearbeiten",
 "Raw LDAP filter" => "Original LDAP-Filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
 "groups found" => "Gruppen gefunden",
-"What attribute shall be used as login name:" => "Welches Attribut soll als Login-Name verwendet werden:",
+"Users login with this attribute:" => "Nutzeranmeldung mit diesem Merkmal:",
 "LDAP Username:" => "LDAP-Benutzername:",
 "LDAP Email Address:" => "LDAP E-Mail-Adresse:",
 "Other Attributes:" => "Andere Attribute:",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Lasse die Felder DN und Passwort für anonymen Zugang leer.",
 "One Base DN per line" => "Ein Basis-DN pro Zeile",
 "You can specify Base DN for users and groups in the Advanced tab" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
-"Limit the access to %s to users meeting this criteria:" => "Beschränke den Zugriff auf %s auf Benutzer, die die folgenden Kriterien erfüllen:",
+"Limit %s access to users meeting these criteria:" => "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.",
 "users found" => "Benutzer gefunden",
 "Back" => "Zurück",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
 "Group Search Attributes" => "Gruppensucheigenschaften",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
+"Nested Groups" => "Eingebundene Gruppen",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
 "Special Attributes" => "Spezielle Eigenschaften",
 "Quota Field" => "Kontingent Feld",
 "Quota Default" => "Standard Kontingent",
diff --git a/apps/user_ldap/l10n/de_AT.php b/apps/user_ldap/l10n/de_AT.php
index 3a1e002311..a4e97dfcad 100644
--- a/apps/user_ldap/l10n/de_AT.php
+++ b/apps/user_ldap/l10n/de_AT.php
@@ -1,6 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Deletion failed" => "Löschen fehlgeschlagen",
 "_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
+"_%s user found_::_%s users found_" => array("",""),
+"Save" => "Speichern",
+"Password" => "Passwort"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 168f1fe059..6e6e29ea3d 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Speichern",
 "Test Configuration" => "Testkonfiguration",
 "Help" => "Hilfe",
-"Limit the access to %s to groups meeting this criteria:" => "Beschränke den Zugriff auf %s auf Gruppen, die die folgenden Kriterien erfüllen:",
+"Groups meeting these criteria are available in %s:" => "Gruppen-Versammlungen mit diesen Kriterien sind verfügbar in %s:",
 "only those object classes:" => "Nur diese Objekt-Klassen:",
 "only from those groups:" => "Nur von diesen Gruppen:",
 "Edit raw filter instead" => "Original-Filter stattdessen bearbeiten",
 "Raw LDAP filter" => "Original LDAP-Filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
 "groups found" => "Gruppen gefunden",
-"What attribute shall be used as login name:" => "Welches Attribut soll als Login-Name verwendet werden:",
+"Users login with this attribute:" => "Nutzeranmeldung mit diesem Merkmal:",
 "LDAP Username:" => "LDAP-Benutzername:",
 "LDAP Email Address:" => "LDAP E-Mail-Adresse:",
 "Other Attributes:" => "Andere Attribute:",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
 "One Base DN per line" => "Ein Basis-DN pro Zeile",
 "You can specify Base DN for users and groups in the Advanced tab" => "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
-"Limit the access to %s to users meeting this criteria:" => "Beschränke den Zugriff auf %s auf Benutzer, die die folgenden Kriterien erfüllen:",
+"Limit %s access to users meeting these criteria:" => "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.",
 "users found" => "Benutzer gefunden",
 "Back" => "Zurück",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Ein Gruppen Basis-DN pro Zeile",
 "Group Search Attributes" => "Gruppensucheigenschaften",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
+"Nested Groups" => "Eingebundene Gruppen",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
 "Special Attributes" => "Spezielle Eigenschaften",
 "Quota Field" => "Kontingent-Feld",
 "Quota Default" => "Standard-Kontingent",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 8369dff489..1e97591195 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "No action specified" => "Καμμία εντολή δεν προσδιορίστηκε",
 "No configuration specified" => "Καμμία διαμόρφωση δεν προσδιορίστηκε",
 "No data specified" => "Δεν προσδιορίστηκαν δεδομένα",
+" Could not set configuration %s" => "Αδυναμία ρύθμισης %s",
 "Deletion failed" => "Η διαγραφή απέτυχε",
 "Take over settings from recent server configuration?" => "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
 "Keep settings?" => "Διατήρηση ρυθμίσεων;",
@@ -32,14 +33,12 @@ $TRANSLATIONS = array(
 "Save" => "Αποθήκευση",
 "Test Configuration" => "Δοκιμαστικες ρυθμισεις",
 "Help" => "Βοήθεια",
-"Limit the access to %s to groups meeting this criteria:" => "Περιορισμός πρόσβασης %s σε ομάδες που ταιριάζουν αυτά τα κριτήρια:",
 "only those object classes:" => "μόνο αυτές οι κλάσεις αντικειμένων:",
 "only from those groups:" => "μόνο από αυτές τις ομάδες:",
 "Edit raw filter instead" => "Επεξεργασία πρωτογενούς φίλτρου αντί αυτού",
 "Raw LDAP filter" => "Πρωτογενές φίλτρο ",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
 "groups found" => "ομάδες βρέθηκαν",
-"What attribute shall be used as login name:" => "Ποια ιδιότητα θα χρησιμοποιηθεί ως όνομα σύνδεσης:",
 "LDAP Username:" => "Όνομα χρήστη LDAP:",
 "LDAP Email Address:" => "Διεύθυνση ηλ. ταχυδρομείου LDAP:",
 "Other Attributes:" => "Άλλες Ιδιότητες:",
@@ -54,7 +53,6 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.",
 "One Base DN per line" => "Ένα DN Βάσης ανά γραμμή ",
 "You can specify Base DN for users and groups in the Advanced tab" => "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις",
-"Limit the access to %s to users meeting this criteria:" => "Περιορισμός πρόσβασης %s σε χρήστες που ταιριάζουν αυτά τα κριτήρια:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
 "users found" => "χρήστες βρέθηκαν",
 "Back" => "Επιστροφή",
@@ -68,6 +66,7 @@ $TRANSLATIONS = array(
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη.",
 "Backup (Replica) Port" => "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη",
 "Disable Main Server" => "Απενεργοποιηση του κεντρικου διακομιστη",
+"Only connect to the replica server." => "Σύνδεση μόνο με το διακομιστή-αντίγραφο.",
 "Case insensitve LDAP server (Windows)" => "LDAP server (Windows) με διάκριση πεζών-ΚΕΦΑΛΑΙΩΝ",
 "Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
 "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Δεν προτείνεται, χρησιμοποιείστε το μόνο για δοκιμές! Εάν η σύνδεση λειτουργεί μόνο με αυτή την επιλογή, εισάγετε το πιστοποιητικό SSL του διακομιστή LDAP στο %s διακομιστή σας.",
diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php
index b83229d5a5..4421a8035c 100644
--- a/apps/user_ldap/l10n/en_GB.php
+++ b/apps/user_ldap/l10n/en_GB.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Save",
 "Test Configuration" => "Test Configuration",
 "Help" => "Help",
-"Limit the access to %s to groups meeting this criteria:" => "Limit the access to %s to groups meeting this criteria:",
+"Groups meeting these criteria are available in %s:" => "Groups meeting these criteria are available in %s:",
 "only those object classes:" => "only those object classes:",
 "only from those groups:" => "only from those groups:",
 "Edit raw filter instead" => "Edit raw filter instead",
 "Raw LDAP filter" => "Raw LDAP filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "The filter specifies which LDAP groups shall have access to the %s instance.",
 "groups found" => "groups found",
-"What attribute shall be used as login name:" => "What attribute should be used as login name:",
+"Users login with this attribute:" => "Users login with this attribute:",
 "LDAP Username:" => "LDAP Username:",
 "LDAP Email Address:" => "LDAP Email Address:",
 "Other Attributes:" => "Other Attributes:",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "For anonymous access, leave DN and Password empty.",
 "One Base DN per line" => "One Base DN per line",
 "You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab",
-"Limit the access to %s to users meeting this criteria:" => "Limit the access to %s to users meeting this criteria:",
+"Limit %s access to users meeting these criteria:" => "Limit %s access to users meeting these criteria:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "The filter specifies which LDAP users shall have access to the %s instance.",
 "users found" => "users found",
 "Back" => "Back",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "One Group Base DN per line",
 "Group Search Attributes" => "Group Search Attributes",
 "Group-Member association" => "Group-Member association",
+"Nested Groups" => "Nested Groups",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)",
 "Special Attributes" => "Special Attributes",
 "Quota Field" => "Quota Field",
 "Quota Default" => "Quota Default",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 3348003e3e..1821aa8d44 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
 "mappings cleared" => "Asignaciones borradas",
 "Success" => "Éxito",
 "Error" => "Error",
-"Configuration OK" => "Configuración OK",
+"Configuration OK" => "Configuración Correcta",
 "Configuration incorrect" => "Configuración Incorrecta",
 "Configuration incomplete" => "Configuración incompleta",
 "Select groups" => "Seleccionar grupos",
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Guardar",
 "Test Configuration" => "Configuración de prueba",
 "Help" => "Ayuda",
-"Limit the access to %s to groups meeting this criteria:" => "Limitar el acceso a %s a los grupos que cumplan este criterio:",
+"Groups meeting these criteria are available in %s:" => "Los grupos que cumplen estos criterios están disponibles en %s:",
 "only those object classes:" => "solamente de estas clases de objeto:",
 "only from those groups:" => "solamente de estos grupos:",
 "Edit raw filter instead" => "Editar el filtro en bruto en su lugar",
 "Raw LDAP filter" => "Filtro LDAP en bruto",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "El filtro especifica que grupos LDAP tendrán acceso a %s.",
 "groups found" => "grupos encontrados",
-"What attribute shall be used as login name:" => "Que atributo debe ser usado como login:",
+"Users login with this attribute:" => "Los usuarios inician sesión con este atributo:",
 "LDAP Username:" => "Nombre de usuario LDAP:",
 "LDAP Email Address:" => "Dirección e-mail LDAP:",
 "Other Attributes:" => "Otros atributos:",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
 "One Base DN per line" => "Un DN Base por línea",
 "You can specify Base DN for users and groups in the Advanced tab" => "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
-"Limit the access to %s to users meeting this criteria:" => "Limitar el acceso a %s a los usuarios que cumplan el siguiente criterio:",
+"Limit %s access to users meeting these criteria:" => "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
 "users found" => "usuarios encontrados",
 "Back" => "Atrás",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Un DN Base de Grupo por línea",
 "Group Search Attributes" => "Atributos de busqueda de grupo",
 "Group-Member association" => "Asociación Grupo-Miembro",
+"Nested Groups" => "Grupos anidados",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Cuando se active, se permitirán grupos que contenga otros grupos (solo funciona si el atributo de miembro de grupo contiene DNs).",
 "Special Attributes" => "Atributos especiales",
 "Quota Field" => "Cuota",
 "Quota Default" => "Cuota por defecto",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 3a8f42e2c9..6323fe0c4a 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -4,6 +4,11 @@ $TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Fallo al borrar la configuración del servidor",
 "The configuration is valid and the connection could be established!" => "La configuración es válida y la conexión pudo ser establecida.",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración es válida, pero el enlace falló. Por favor, comprobá la configuración del servidor y las credenciales.",
+"The configuration is invalid. Please have a look at the logs for further details." => "La configuración es inválida. Por favor, verifique los logs para más detalles.",
+"No action specified" => "No se ha especificado una acción",
+"No configuration specified" => "No se ha especificado una configuración",
+"No data specified" => "No se ha especificado datos",
+" Could not set configuration %s" => "No se pudo asignar la configuración %s",
 "Deletion failed" => "Error al borrar",
 "Take over settings from recent server configuration?" => "Tomar los valores de la anterior configuración de servidor?",
 "Keep settings?" => "¿Mantener preferencias?",
@@ -11,16 +16,32 @@ $TRANSLATIONS = array(
 "mappings cleared" => "Asignaciones borradas",
 "Success" => "Éxito",
 "Error" => "Error",
+"Configuration OK" => "Configuración válida",
+"Configuration incorrect" => "Configuración incorrecta",
+"Configuration incomplete" => "Configuración incompleta",
 "Select groups" => "Seleccionar grupos",
+"Select object classes" => "Seleccionar las clases de objetos",
+"Select attributes" => "Seleccionar atributos",
 "Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
 "Connection test failed" => "Falló es test de conexión",
 "Do you really want to delete the current Server Configuration?" => "¿Realmente desea borrar la configuración actual del servidor?",
 "Confirm Deletion" => "Confirmar borrado",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
+"_%s group found_::_%s groups found_" => array("%s grupo encontrado","%s grupos encontrados"),
+"_%s user found_::_%s users found_" => array("%s usuario encontrado","%s usuarios encontrados"),
+"Invalid Host" => "Host inválido",
+"Could not find the desired feature" => "No se pudo encontrar la característica deseada",
 "Save" => "Guardar",
 "Test Configuration" => "Probar configuración",
 "Help" => "Ayuda",
+"only those object classes:" => "solo estos objetos de clases:",
+"only from those groups:" => "solo provenientes de estos grupos:",
+"Edit raw filter instead" => "Editar filtro en bruto",
+"Raw LDAP filter" => "Filtro LDAP en bruto",
+"The filter specifies which LDAP groups shall have access to the %s instance." => "El filtro especifica qué grupos LDAP deben tener acceso a la instancia %s.",
+"groups found" => "grupos encontrados",
+"LDAP Username:" => "Nombre de usuario LDAP:",
+"LDAP Email Address:" => "Correo electrónico LDAP:",
+"Other Attributes:" => "Otros atributos:",
 "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
 "Add Server Configuration" => "Añadir Configuración del Servidor",
 "Host" => "Servidor",
@@ -32,7 +53,10 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, dejá DN y contraseña vacíos.",
 "One Base DN per line" => "Una DN base por línea",
 "You can specify Base DN for users and groups in the Advanced tab" => "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"",
+"The filter specifies which LDAP users shall have access to the %s instance." => "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s.",
+"users found" => "usuarios encontrados",
 "Back" => "Volver",
+"Continue" => "Continuar",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale.",
 "Connection Settings" => "Configuración de Conección",
diff --git a/apps/user_ldap/l10n/es_CL.php b/apps/user_ldap/l10n/es_CL.php
index b3522617b4..40fa5aad8e 100644
--- a/apps/user_ldap/l10n/es_CL.php
+++ b/apps/user_ldap/l10n/es_CL.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Error" => "Error",
 "_%s group found_::_%s groups found_" => array("",""),
 "_%s user found_::_%s users found_" => array("",""),
 "Password" => "Clave"
diff --git a/apps/user_ldap/l10n/es_MX.php b/apps/user_ldap/l10n/es_MX.php
index 16aaa91fd5..09c99209a5 100644
--- a/apps/user_ldap/l10n/es_MX.php
+++ b/apps/user_ldap/l10n/es_MX.php
@@ -33,14 +33,12 @@ $TRANSLATIONS = array(
 "Save" => "Guardar",
 "Test Configuration" => "Configuración de prueba",
 "Help" => "Ayuda",
-"Limit the access to %s to groups meeting this criteria:" => "Limitar el acceso a %s a los grupos que cumplan este criterio:",
 "only those object classes:" => "solamente de estas clases de objeto:",
 "only from those groups:" => "solamente de estos grupos:",
 "Edit raw filter instead" => "Editar el filtro en bruto en su lugar",
 "Raw LDAP filter" => "Filtro LDAP en bruto",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "El filtro especifica que grupos LDAP tendrán acceso a %s.",
 "groups found" => "grupos encontrados",
-"What attribute shall be used as login name:" => "Que atributo debe ser usado como login:",
 "LDAP Username:" => "Nombre de usuario LDAP:",
 "LDAP Email Address:" => "Dirección e-mail LDAP:",
 "Other Attributes:" => "Otros atributos:",
@@ -55,7 +53,6 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
 "One Base DN per line" => "Un DN Base por línea",
 "You can specify Base DN for users and groups in the Advanced tab" => "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
-"Limit the access to %s to users meeting this criteria:" => "Limitar el acceso a %s a los usuarios que cumplan el siguiente criterio:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
 "users found" => "usuarios encontrados",
 "Back" => "Atrás",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 10f513c8b8..090accceda 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -33,14 +33,12 @@ $TRANSLATIONS = array(
 "Save" => "Salvesta",
 "Test Configuration" => "Testi seadistust",
 "Help" => "Abiinfo",
-"Limit the access to %s to groups meeting this criteria:" => "Piira ligipääs %s grupile, mis sobivad kriteeriumiga:",
 "only those object classes:" => "ainult need objektiklassid:",
 "only from those groups:" => "ainult nendest gruppidest:",
 "Edit raw filter instead" => "Selle asemel muuda filtrit",
 "Raw LDAP filter" => "LDAP filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
 "groups found" => "gruppi leitud",
-"What attribute shall be used as login name:" => "Mis atribuuti kasutada sisselogimise kasutajatunnusena:",
 "LDAP Username:" => "LDAP kasutajanimi:",
 "LDAP Email Address:" => "LDAP e-posti aadress:",
 "Other Attributes:" => "Muud atribuudid:",
@@ -55,7 +53,6 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
 "One Base DN per line" => "Üks baas-DN rea kohta",
 "You can specify Base DN for users and groups in the Advanced tab" => "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt",
-"Limit the access to %s to users meeting this criteria:" => "Piira ligipääs %s kasutajale, kes sobivad kriteeriumiga:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.",
 "users found" => "kasutajat leitud",
 "Back" => "Tagasi",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 1026e01715..a7bd52e50a 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -31,12 +31,10 @@ $TRANSLATIONS = array(
 "Save" => "Gorde",
 "Test Configuration" => "Egiaztatu Konfigurazioa",
 "Help" => "Laguntza",
-"Limit the access to %s to groups meeting this criteria:" => "Mugatu sarrera baldintza hauek betetzen dituzten %s taldetara:",
 "only those object classes:" => "bakarrik objektu klase hauetakoak:",
 "only from those groups:" => "bakarrik talde hauetakoak:",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Iragazkiak zehazten du  ze LDAP taldek izango duten sarrera %s instantziara:",
 "groups found" => "talde aurkituta",
-"What attribute shall be used as login name:" => "Sarrera izen gisa erabiliko den atributua:",
 "LDAP Username:" => "LDAP Erabiltzaile izena:",
 "LDAP Email Address:" => "LDAP Eposta helbidea:",
 "Other Attributes:" => "Bestelako atributuak:",
@@ -50,7 +48,6 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
 "One Base DN per line" => "DN Oinarri bat lerroko",
 "You can specify Base DN for users and groups in the Advanced tab" => "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
-"Limit the access to %s to users meeting this criteria:" => "Mugatu sarrera hurrengo baldintzak betetzen duten %s erabiltzaileei:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
 "users found" => "erabiltzaile aurkituta",
 "Back" => "Atzera",
diff --git a/apps/user_ldap/l10n/eu_ES.php b/apps/user_ldap/l10n/eu_ES.php
new file mode 100644
index 0000000000..6dbfd1955d
--- /dev/null
+++ b/apps/user_ldap/l10n/eu_ES.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("",""),
+"Save" => "Gorde"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index a5429130d6..dbcaadfc2a 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Sauvegarder",
 "Test Configuration" => "Tester la configuration",
 "Help" => "Aide",
-"Limit the access to %s to groups meeting this criteria:" => "Limiter l'accès à %s aux groupes respectant ce critère :",
+"Groups meeting these criteria are available in %s:" => "Les groupes respectant ces critères sont disponibles dans %s :",
 "only those object classes:" => "seulement ces classes d'objet :",
 "only from those groups:" => "seulement de ces groupes :",
 "Edit raw filter instead" => "Éditer le filtre raw à la place",
 "Raw LDAP filter" => "Filtre Raw LDAP",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Le filtre spécifie quels groupes LDAP doivent avoir accès à l'instance %s.",
 "groups found" => "groupes trouvés",
-"What attribute shall be used as login name:" => "Quel attribut doit être utilisé comme nom de login:",
+"Users login with this attribute:" => "Utilisateurs se connectant avec cet attribut :",
 "LDAP Username:" => "Nom d'utilisateur LDAP :",
 "LDAP Email Address:" => "Adresse email LDAP :",
 "Other Attributes:" => "Autres attributs :",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
 "One Base DN per line" => "Un DN racine par ligne",
 "You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
-"Limit the access to %s to users meeting this criteria:" => "Limiter l'accès à %s aux utilisateurs respectant ce critère :",
+"Limit %s access to users meeting these criteria:" => "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
 "users found" => "utilisateurs trouvés",
 "Back" => "Retour",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Un DN racine groupe par ligne",
 "Group Search Attributes" => "Recherche des attributs du groupe",
 "Group-Member association" => "Association groupe-membre",
+"Nested Groups" => "Groupes imbriqués",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Si activé, les groupes contenant d'autres groupes sont supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs).",
 "Special Attributes" => "Attributs spéciaux",
 "Quota Field" => "Champ du quota",
 "Quota Default" => "Quota par défaut",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index 34e818ef95..802c6d0e43 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Gardar",
 "Test Configuration" => "Probar a configuración",
 "Help" => "Axuda",
-"Limit the access to %s to groups meeting this criteria:" => "Limitar o acceso a %s aos grupos que coincidan con estes criterios:",
+"Groups meeting these criteria are available in %s:" => "Os grupos que cumpren estes criterios están dispoñíbeis en %s:",
 "only those object classes:" => "só as clases de obxecto:",
 "only from those groups:" => "só dos grupos:",
 "Edit raw filter instead" => "Editar, no seu canto, o filtro en bruto",
 "Raw LDAP filter" => "Filtro LDAP en bruto",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica que grupos LDAP teñen acceso á instancia %s.",
 "groups found" => "atopáronse grupos",
-"What attribute shall be used as login name:" => "Atributo que utilizar como nome de usuario:",
+"Users login with this attribute:" => "Os usuarios inician sesión con este atributo:",
 "LDAP Username:" => "Nome de usuario LDAP:",
 "LDAP Email Address:" => "Enderezo de correo LDAP:",
 "Other Attributes:" => "Outros atributos:",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Para o acceso anónimo deixe o DN e o contrasinal baleiros.",
 "One Base DN per line" => "Un DN base por liña",
 "You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»",
-"Limit the access to %s to users meeting this criteria:" => "Limitar o acceso a %s aos usuarios que coincidan con estes criterios:",
+"Limit %s access to users meeting these criteria:" => "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "O filtro especifica que usuarios LDAP teñen acceso á instancia %s.",
 "users found" => "atopáronse usuarios",
 "Back" => "Atrás",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Un DN base de grupo por liña",
 "Group Search Attributes" => "Atributos de busca do grupo",
 "Group-Member association" => "Asociación de grupos e membros",
+"Nested Groups" => "Grupos aniñados",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Se está activado, admítense grupos que conteñen grupos. (Só funciona se o atributo de membro de grupo conten os DN.)",
 "Special Attributes" => "Atributos especiais",
 "Quota Field" => "Campo de cota",
 "Quota Default" => "Cota predeterminada",
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 2799d0407c..277ae96fcd 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -33,14 +33,12 @@ $TRANSLATIONS = array(
 "Save" => "Mentés",
 "Test Configuration" => "A beállítások tesztelése",
 "Help" => "Súgó",
-"Limit the access to %s to groups meeting this criteria:" => "Korlátozzuk %s elérését a következő feltételeknek megfelelő csoportokra:",
 "only those object classes:" => "csak ezek az objektumosztályok:",
 "only from those groups:" => "csak ezek a csoportok:",
 "Edit raw filter instead" => "Inkább közvetlenül megadom a szűrési kifejezést:",
 "Raw LDAP filter" => "Az LDAP szűrőkifejezés",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.",
 "groups found" => "csoport van",
-"What attribute shall be used as login name:" => "Melyik attribútumot használjuk login névként:",
 "LDAP Username:" => "LDAP felhasználónév:",
 "LDAP Email Address:" => "LDAP e-mail cím:",
 "Other Attributes:" => "Más attribútumok:",
@@ -55,7 +53,6 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
 "One Base DN per line" => "Soronként egy DN-gyökér",
 "You can specify Base DN for users and groups in the Advanced tab" => "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára",
-"Limit the access to %s to users meeting this criteria:" => "Korlátozzuk %s elérését a következő feltételeknek megfelelő felhasználókra:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.",
 "users found" => "felhasználó van",
 "Back" => "Vissza",
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index f5e53bdbe9..4436127747 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Salva",
 "Test Configuration" => "Prova configurazione",
 "Help" => "Aiuto",
-"Limit the access to %s to groups meeting this criteria:" => "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
+"Groups meeting these criteria are available in %s:" => "I gruppi che corrispondono a questi criteri sono disponibili in %s:",
 "only those object classes:" => "solo queste classi di oggetti:",
 "only from those groups:" => "solo da questi gruppi:",
 "Edit raw filter instead" => "Modifica invece il filtro grezzo",
 "Raw LDAP filter" => "Filtro LDAP grezzo",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Il filtro specifica quali gruppi LDAP devono avere accesso all'istanza %s.",
 "groups found" => "gruppi trovati",
-"What attribute shall be used as login name:" => "Quale attributo deve essere usato come nome di accesso:",
+"Users login with this attribute:" => "Utenti con questo attributo:",
 "LDAP Username:" => "Nome utente LDAP:",
 "LDAP Email Address:" => "Indirizzo email LDAP:",
 "Other Attributes:" => "Altri attributi:",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
 "One Base DN per line" => "Un DN base per riga",
 "You can specify Base DN for users and groups in the Advanced tab" => "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
-"Limit the access to %s to users meeting this criteria:" => "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
+"Limit %s access to users meeting these criteria:" => "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.",
 "users found" => "utenti trovati",
 "Back" => "Indietro",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Un DN base gruppo per riga",
 "Group Search Attributes" => "Attributi di ricerca gruppo",
 "Group-Member association" => "Associazione gruppo-utente ",
+"Nested Groups" => "Gruppi nidificati",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quando è attivato, i gruppi che contengono altri gruppi sono supportati. (Funziona solo se l'attributo del gruppo membro contiene DN.)",
 "Special Attributes" => "Attributi speciali",
 "Quota Field" => "Campo Quota",
 "Quota Default" => "Quota predefinita",
diff --git a/apps/user_ldap/l10n/ja.php b/apps/user_ldap/l10n/ja.php
new file mode 100644
index 0000000000..d13deafe6c
--- /dev/null
+++ b/apps/user_ldap/l10n/ja.php
@@ -0,0 +1,112 @@
+<?php
+$TRANSLATIONS = array(
+"Failed to clear the mappings." => "マッピングのクリアに失敗しました。",
+"Failed to delete the server configuration" => "サーバー設定の削除に失敗しました",
+"The configuration is valid and the connection could be established!" => "設定は有効であり、接続を確立しました！",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定は有効ですが、接続に失敗しました。サーバー設定と資格情報を確認してください。",
+"The configuration is invalid. Please have a look at the logs for further details." => "設定が無効です。詳細はログを確認してください。",
+"No action specified" => "アクションが指定されていません",
+"No configuration specified" => "構成が指定されていません",
+"No data specified" => "データが指定されていません",
+" Could not set configuration %s" => "構成 %s を設定できませんでした",
+"Deletion failed" => "削除に失敗しました",
+"Take over settings from recent server configuration?" => "最近のサーバー設定から設定を引き継ぎますか？",
+"Keep settings?" => "設定を保持しますか？",
+"Cannot add server configuration" => "サーバー設定を追加できません",
+"mappings cleared" => "マッピングをクリアしました",
+"Success" => "成功",
+"Error" => "エラー",
+"Configuration OK" => "設定OK",
+"Configuration incorrect" => "設定に誤りがあります",
+"Configuration incomplete" => "設定が不完全です",
+"Select groups" => "グループを選択",
+"Select object classes" => "オブジェクトクラスを選択",
+"Select attributes" => "属性を選択",
+"Connection test succeeded" => "接続テストに成功しました",
+"Connection test failed" => "接続テストに失敗しました",
+"Do you really want to delete the current Server Configuration?" => "現在のサーバー設定を本当に削除してもよろしいですか？",
+"Confirm Deletion" => "削除の確認",
+"_%s group found_::_%s groups found_" => array("%s グループが見つかりました"),
+"_%s user found_::_%s users found_" => array("%s ユーザーが見つかりました"),
+"Invalid Host" => "無効なホスト",
+"Could not find the desired feature" => "望ましい機能は見つかりませんでした",
+"Save" => "保存",
+"Test Configuration" => "設定をテスト",
+"Help" => "ヘルプ",
+"Groups meeting these criteria are available in %s:" => "これらの基準を満たすグループが %s で利用可能:",
+"only those object classes:" => "それらのオブジェクトクラスのみ:",
+"only from those groups:" => "それらのグループからのみ:",
+"Edit raw filter instead" => "フィルタを編集",
+"Raw LDAP filter" => "LDAP フィルタ",
+"The filter specifies which LDAP groups shall have access to the %s instance." => "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+"groups found" => "グループが見つかりました",
+"Users login with this attribute:" => "この属性でユーザーログイン:",
+"LDAP Username:" => "LDAP ユーザー名:",
+"LDAP Email Address:" => "LDAP メールアドレス:",
+"Other Attributes:" => "他の属性:",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"",
+"Add Server Configuration" => "サーバー設定を追加",
+"Host" => "ホスト",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
+"Port" => "ポート",
+"User DN" => "ユーザーDN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。",
+"Password" => "パスワード",
+"For anonymous access, leave DN and Password empty." => "匿名アクセスの場合は、DNとパスワードを空にしてください。",
+"One Base DN per line" => "1行に1つのベースDN",
+"You can specify Base DN for users and groups in the Advanced tab" => "拡張タブでユーザーとグループのベースDNを指定することができます。",
+"Limit %s access to users meeting these criteria:" => "この基準を満たすユーザに対し %s へのアクセスを制限:",
+"The filter specifies which LDAP users shall have access to the %s instance." => "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
+"users found" => "ユーザーが見つかりました",
+"Back" => "戻る",
+"Continue" => "続ける",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しく動作しません。システム管理者にインストールするよう問い合わせてください。",
+"Connection Settings" => "接続設定",
+"Configuration Active" => "設定はアクティブです",
+"When unchecked, this configuration will be skipped." => "チェックを外すと、この設定はスキップされます。",
+"Backup (Replica) Host" => "バックアップ（レプリカ）ホスト",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバーのレプリカである必要があります。",
+"Backup (Replica) Port" => "バックアップ（レプリカ）ポート",
+"Disable Main Server" => "メインサーバーを無効にする",
+"Only connect to the replica server." => "レプリカサーバーにのみ接続します。",
+"Case insensitve LDAP server (Windows)" => "大文字／小文字を区別しないLDAPサーバー（Windows）",
+"Turn off SSL certificate validation." => "SSL証明書の確認を無効にする。",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。",
+"Cache Time-To-Live" => "キャッシュのTTL",
+"in seconds. A change empties the cache." => "秒。変更後にキャッシュがクリアされます。",
+"Directory Settings" => "ディレクトリ設定",
+"User Display Name Field" => "ユーザー表示名のフィールド",
+"The LDAP attribute to use to generate the user's display name." => "ユーザーの表示名の生成に利用するLDAP属性",
+"Base User Tree" => "ベースユーザーツリー",
+"One User Base DN per line" => "1行に1つのユーザーベースDN",
+"User Search Attributes" => "ユーザー検索属性",
+"Optional; one attribute per line" => "オプション：1行に1属性",
+"Group Display Name Field" => "グループ表示名のフィールド",
+"The LDAP attribute to use to generate the groups's display name." => "ユーザのグループ表示名の生成に利用するLDAP属性",
+"Base Group Tree" => "ベースグループツリー",
+"One Group Base DN per line" => "1行に1つのグループベースDN",
+"Group Search Attributes" => "グループ検索属性",
+"Group-Member association" => "グループとメンバーの関連付け",
+"Nested Groups" => "ネスト化ブロック",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "オンに切り替えたら、グループを含むグループがサポートされます。(グループメンバーの属性がDNを含む場合のみ有効です。)",
+"Special Attributes" => "特殊属性",
+"Quota Field" => "クォータフィールド",
+"Quota Default" => "クォータのデフォルト",
+"in bytes" => "バイト",
+"Email Field" => "メールフィールド",
+"User Home Folder Naming Rule" => "ユーザーのホームフォルダー命名規則",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザー名を空のままにしてください（デフォルト）。もしくは、LDAPもしくはADの属性を指定してください。",
+"Internal Username" => "内部ユーザー名",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "デフォルトでは、内部ユーザー名はUUID属性から作成されます。これにより、ユーザー名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザー名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザー名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダー名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザー表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザーにおいてのみ有効となります。",
+"Internal Username Attribute:" => "内部ユーザー名属性:",
+"Override UUID detection" => "UUID検出を再定義する",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザーとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザー名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザーとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザーとLDAPグループに対してのみ有効となります。",
+"UUID Attribute for Users:" => "ユーザーの UUID 属性:",
+"UUID Attribute for Groups:" => "グループの UUID 属性:",
+"Username-LDAP User Mapping" => "ユーザー名とLDAPユーザのマッピング",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
+"Clear Username-LDAP User Mapping" => "ユーザー名とLDAPユーザーのマッピングをクリアする",
+"Clear Groupname-LDAP Group Mapping" => "グループ名とLDAPグループのマッピングをクリアする"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 8e98e80370..d13deafe6c 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,18 +1,18 @@
 <?php
 $TRANSLATIONS = array(
 "Failed to clear the mappings." => "マッピングのクリアに失敗しました。",
-"Failed to delete the server configuration" => "サーバ設定の削除に失敗しました",
+"Failed to delete the server configuration" => "サーバー設定の削除に失敗しました",
 "The configuration is valid and the connection could be established!" => "設定は有効であり、接続を確立しました！",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定は有効ですが、接続に失敗しました。サーバ設定と資格情報を確認して下さい。",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "設定は有効ですが、接続に失敗しました。サーバー設定と資格情報を確認してください。",
 "The configuration is invalid. Please have a look at the logs for further details." => "設定が無効です。詳細はログを確認してください。",
 "No action specified" => "アクションが指定されていません",
 "No configuration specified" => "構成が指定されていません",
 "No data specified" => "データが指定されていません",
 " Could not set configuration %s" => "構成 %s を設定できませんでした",
 "Deletion failed" => "削除に失敗しました",
-"Take over settings from recent server configuration?" => "最近のサーバ設定から設定を引き継ぎますか？",
+"Take over settings from recent server configuration?" => "最近のサーバー設定から設定を引き継ぎますか？",
 "Keep settings?" => "設定を保持しますか？",
-"Cannot add server configuration" => "サーバ設定を追加できません",
+"Cannot add server configuration" => "サーバー設定を追加できません",
 "mappings cleared" => "マッピングをクリアしました",
 "Success" => "成功",
 "Error" => "エラー",
@@ -24,40 +24,40 @@ $TRANSLATIONS = array(
 "Select attributes" => "属性を選択",
 "Connection test succeeded" => "接続テストに成功しました",
 "Connection test failed" => "接続テストに失敗しました",
-"Do you really want to delete the current Server Configuration?" => "現在のサーバ設定を本当に削除してもよろしいですか？",
+"Do you really want to delete the current Server Configuration?" => "現在のサーバー設定を本当に削除してもよろしいですか？",
 "Confirm Deletion" => "削除の確認",
 "_%s group found_::_%s groups found_" => array("%s グループが見つかりました"),
-"_%s user found_::_%s users found_" => array("%s ユーザが見つかりました"),
+"_%s user found_::_%s users found_" => array("%s ユーザーが見つかりました"),
 "Invalid Host" => "無効なホスト",
 "Could not find the desired feature" => "望ましい機能は見つかりませんでした",
 "Save" => "保存",
 "Test Configuration" => "設定をテスト",
 "Help" => "ヘルプ",
-"Limit the access to %s to groups meeting this criteria:" => "この基準に合致するグループに %s へのアクセスを制限:",
+"Groups meeting these criteria are available in %s:" => "これらの基準を満たすグループが %s で利用可能:",
 "only those object classes:" => "それらのオブジェクトクラスのみ:",
 "only from those groups:" => "それらのグループからのみ:",
 "Edit raw filter instead" => "フィルタを編集",
 "Raw LDAP filter" => "LDAP フィルタ",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
 "groups found" => "グループが見つかりました",
-"What attribute shall be used as login name:" => "ログイン名として利用する属性:",
-"LDAP Username:" => "LDAP ユーザ名:",
+"Users login with this attribute:" => "この属性でユーザーログイン:",
+"LDAP Username:" => "LDAP ユーザー名:",
 "LDAP Email Address:" => "LDAP メールアドレス:",
 "Other Attributes:" => "他の属性:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザ名が入ります。例： \"uid=%%uid\"",
-"Add Server Configuration" => "サーバ設定を追加",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"",
+"Add Server Configuration" => "サーバー設定を追加",
 "Host" => "ホスト",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
 "Port" => "ポート",
-"User DN" => "ユーザDN",
+"User DN" => "ユーザーDN",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。",
 "Password" => "パスワード",
 "For anonymous access, leave DN and Password empty." => "匿名アクセスの場合は、DNとパスワードを空にしてください。",
 "One Base DN per line" => "1行に1つのベースDN",
-"You can specify Base DN for users and groups in the Advanced tab" => "拡張タブでユーザとグループのベースDNを指定することができます。",
-"Limit the access to %s to users meeting this criteria:" => "この基準に合致するユーザに %s へのアクセスを制限:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "フィルタは、どの LDAP ユーザが %s にアクセスするかを指定します。",
-"users found" => "ユーザが見つかりました",
+"You can specify Base DN for users and groups in the Advanced tab" => "拡張タブでユーザーとグループのベースDNを指定することができます。",
+"Limit %s access to users meeting these criteria:" => "この基準を満たすユーザに対し %s へのアクセスを制限:",
+"The filter specifies which LDAP users shall have access to the %s instance." => "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
+"users found" => "ユーザーが見つかりました",
 "Back" => "戻る",
 "Continue" => "続ける",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
@@ -66,21 +66,21 @@ $TRANSLATIONS = array(
 "Configuration Active" => "設定はアクティブです",
 "When unchecked, this configuration will be skipped." => "チェックを外すと、この設定はスキップされます。",
 "Backup (Replica) Host" => "バックアップ（レプリカ）ホスト",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバのレプリカである必要があります。",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバーのレプリカである必要があります。",
 "Backup (Replica) Port" => "バックアップ（レプリカ）ポート",
-"Disable Main Server" => "メインサーバを無効にする",
+"Disable Main Server" => "メインサーバーを無効にする",
 "Only connect to the replica server." => "レプリカサーバーにのみ接続します。",
-"Case insensitve LDAP server (Windows)" => "大文字／小文字を区別しないLDAPサーバ（Windows）",
+"Case insensitve LDAP server (Windows)" => "大文字／小文字を区別しないLDAPサーバー（Windows）",
 "Turn off SSL certificate validation." => "SSL証明書の確認を無効にする。",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバのSSL証明書を %s サーバにインポートしてください。",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。",
 "Cache Time-To-Live" => "キャッシュのTTL",
 "in seconds. A change empties the cache." => "秒。変更後にキャッシュがクリアされます。",
 "Directory Settings" => "ディレクトリ設定",
-"User Display Name Field" => "ユーザ表示名のフィールド",
-"The LDAP attribute to use to generate the user's display name." => "ユーザの表示名の生成に利用するLDAP属性",
-"Base User Tree" => "ベースユーザツリー",
-"One User Base DN per line" => "1行に1つのユーザベースDN",
-"User Search Attributes" => "ユーザ検索属性",
+"User Display Name Field" => "ユーザー表示名のフィールド",
+"The LDAP attribute to use to generate the user's display name." => "ユーザーの表示名の生成に利用するLDAP属性",
+"Base User Tree" => "ベースユーザーツリー",
+"One User Base DN per line" => "1行に1つのユーザーベースDN",
+"User Search Attributes" => "ユーザー検索属性",
 "Optional; one attribute per line" => "オプション：1行に1属性",
 "Group Display Name Field" => "グループ表示名のフィールド",
 "The LDAP attribute to use to generate the groups's display name." => "ユーザのグループ表示名の生成に利用するLDAP属性",
@@ -88,23 +88,25 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "1行に1つのグループベースDN",
 "Group Search Attributes" => "グループ検索属性",
 "Group-Member association" => "グループとメンバーの関連付け",
+"Nested Groups" => "ネスト化ブロック",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "オンに切り替えたら、グループを含むグループがサポートされます。(グループメンバーの属性がDNを含む場合のみ有効です。)",
 "Special Attributes" => "特殊属性",
 "Quota Field" => "クォータフィールド",
 "Quota Default" => "クォータのデフォルト",
 "in bytes" => "バイト",
 "Email Field" => "メールフィールド",
-"User Home Folder Naming Rule" => "ユーザのホームフォルダ命名規則",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。",
-"Internal Username" => "内部ユーザ名",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザにおいてのみ有効となります。",
-"Internal Username Attribute:" => "内部ユーザ名属性:",
+"User Home Folder Naming Rule" => "ユーザーのホームフォルダー命名規則",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザー名を空のままにしてください（デフォルト）。もしくは、LDAPもしくはADの属性を指定してください。",
+"Internal Username" => "内部ユーザー名",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "デフォルトでは、内部ユーザー名はUUID属性から作成されます。これにより、ユーザー名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザー名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザー名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダー名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザー表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザーにおいてのみ有効となります。",
+"Internal Username Attribute:" => "内部ユーザー名属性:",
 "Override UUID detection" => "UUID検出を再定義する",
-"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザとLDAPグループに対してのみ有効となります。",
-"UUID Attribute for Users:" => "ユーザの UUID 属性:",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザーとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザー名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザーとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザーとLDAPグループに対してのみ有効となります。",
+"UUID Attribute for Users:" => "ユーザーの UUID 属性:",
 "UUID Attribute for Groups:" => "グループの UUID 属性:",
-"Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピング",
-"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ユーザ名は（メタ）データの保存と割り当てに使用されます。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザ名からLDAPユーザへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
-"Clear Username-LDAP User Mapping" => "ユーザ名とLDAPユーザのマッピングをクリアする",
+"Username-LDAP User Mapping" => "ユーザー名とLDAPユーザのマッピング",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
+"Clear Username-LDAP User Mapping" => "ユーザー名とLDAPユーザーのマッピングをクリアする",
 "Clear Groupname-LDAP Group Mapping" => "グループ名とLDAPグループのマッピングをクリアする"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/km.php b/apps/user_ldap/l10n/km.php
index bba52d53a1..ad3cc4882c 100644
--- a/apps/user_ldap/l10n/km.php
+++ b/apps/user_ldap/l10n/km.php
@@ -1,6 +1,20 @@
 <?php
 $TRANSLATIONS = array(
+"Failed to delete the server configuration" => "លុប​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ មិន​បាន​សម្រេច",
+"Deletion failed" => "លុប​មិន​បាន​សម្រេច",
+"Keep settings?" => "រក្សា​ទុក​ការ​កំណត់?",
+"Cannot add server configuration" => "មិន​អាច​បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
+"Error" => "កំហុស",
+"Connection test succeeded" => "សាក​ល្បង​ការ​ត​ភ្ជាប់ បាន​ជោគជ័យ",
+"Connection test failed" => "សាកល្បង​ការ​តភ្ជាប់ មិន​បាន​សម្រេច",
+"Do you really want to delete the current Server Configuration?" => "តើ​អ្នក​ពិត​ជា​ចង់​លុប​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ​បច្ចុប្បន្ន​មែន​ទេ?",
+"Confirm Deletion" => "បញ្ជាក់​ការ​លុប",
 "_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array("")
+"_%s user found_::_%s users found_" => array(""),
+"Save" => "រក្សាទុក",
+"Help" => "ជំនួយ",
+"Add Server Configuration" => "បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
+"Host" => "ម៉ាស៊ីន​ផ្ទុក",
+"Password" => "ពាក្យសម្ងាត់"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 2d861f27ba..5dd2151a41 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -33,14 +33,12 @@ $TRANSLATIONS = array(
 "Save" => "저장",
 "Test Configuration" => "설정 시험",
 "Help" => "도움말",
-"Limit the access to %s to groups meeting this criteria:" => "다음 조건을 만족하는 그룹만 %s 접근 허용:",
 "only those object classes:" => "다음 객체 클래스만:",
 "only from those groups:" => "다음 그룹에서만:",
 "Edit raw filter instead" => "필터 직접 편집",
 "Raw LDAP filter" => "LDAP 필터",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "이 필터는 %s에 접근할 수 있는 LDAP 그룹을 설정합니다.",
 "groups found" => "그룹 찾음",
-"What attribute shall be used as login name:" => "로그인 이름으로 사용할 속성:",
 "LDAP Username:" => "LDAP 사용자 이름:",
 "LDAP Email Address:" => "LDAP 이메일 주소:",
 "Other Attributes:" => "기타 속성:",
@@ -55,7 +53,6 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "익명 접근을 허용하려면 DN과 암호를 비워 두십시오.",
 "One Base DN per line" => "기본 DN을 한 줄에 하나씩 입력하십시오",
 "You can specify Base DN for users and groups in the Advanced tab" => "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다.",
-"Limit the access to %s to users meeting this criteria:" => "다음 조건을 만족하는 사용자만 %s 접근 허용:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.",
 "users found" => "사용자 찾음",
 "Back" => "뒤로",
diff --git a/apps/user_ldap/l10n/ml.php b/apps/user_ldap/l10n/ml.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/ml.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/mn.php b/apps/user_ldap/l10n/mn.php
new file mode 100644
index 0000000000..3a1e002311
--- /dev/null
+++ b/apps/user_ldap/l10n/mn.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array("",""),
+"_%s user found_::_%s users found_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
index 625ec79d76..0b60752e9d 100644
--- a/apps/user_ldap/l10n/nb_NO.php
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -1,23 +1,48 @@
 <?php
 $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Klarte ikke å nullstille tilknytningene.",
 "Failed to delete the server configuration" => "Klarte ikke å slette tjener-konfigurasjonen.",
 "The configuration is valid and the connection could be established!" => "Konfigurasjonen er i orden og tilkoblingen skal være etablert!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasjonen er i orden, men Bind mislyktes. Vennligst sjekk tjener-konfigurasjonen og påloggingsinformasjonen.",
+"The configuration is invalid. Please have a look at the logs for further details." => "Konfigurasjonen er ikke gyldig. Sjekk loggene for flere detaljer.",
+"No action specified" => "Ingen handling spesifisert",
+"No configuration specified" => "Ingen konfigurasjon spesifisert",
+"No data specified" => "Ingen data spesifisert",
+" Could not set configuration %s" => "Klarte ikke å sette konfigurasjon %s",
 "Deletion failed" => "Sletting mislyktes",
 "Take over settings from recent server configuration?" => "Hent innstillinger fra tidligere tjener-konfigurasjon?",
 "Keep settings?" => "Behold innstillinger?",
 "Cannot add server configuration" => "Kan ikke legge til tjener-konfigurasjon",
+"mappings cleared" => "tilknytninger nullstilt",
 "Success" => "Suksess",
 "Error" => "Feil",
+"Configuration OK" => "Konfigurasjon OK",
+"Configuration incorrect" => "Konfigurasjon feil",
+"Configuration incomplete" => "Konfigurasjon ufullstendig",
 "Select groups" => "Velg grupper",
+"Select object classes" => "Velg objektklasser",
+"Select attributes" => "Velg attributter",
 "Connection test succeeded" => "Tilkoblingstest lyktes",
 "Connection test failed" => "Tilkoblingstest mislyktes",
 "Do you really want to delete the current Server Configuration?" => "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
 "Confirm Deletion" => "Bekreft sletting",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
+"_%s group found_::_%s groups found_" => array("%s gruppe funnet","%s grupper funnet"),
+"_%s user found_::_%s users found_" => array("%s bruker funnet","%s brukere funnet"),
+"Invalid Host" => "Ugyldig tjener",
+"Could not find the desired feature" => "Fant ikke den ønskede funksjonaliteten",
 "Save" => "Lagre",
+"Test Configuration" => "Test konfigurasjonen",
 "Help" => "Hjelp",
+"only those object classes:" => "kun de objektklassene:",
+"only from those groups:" => "kun fra de gruppene:",
+"Edit raw filter instead" => "Rediger ubearbeidet filter i stedet",
+"Raw LDAP filter" => "Ubearbeidet LDAP-filter",
+"The filter specifies which LDAP groups shall have access to the %s instance." => "Filteret spesifiserer hvilke LDAP-grupper som skal ha tilgang til %s-instansen.",
+"groups found" => "grupper funnet",
+"LDAP Username:" => "LDAP-brukernavn:",
+"LDAP Email Address:" => "LDAP-epostadresse:",
+"Other Attributes:" => "Andre attributter:",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definerer filteret som skal brukes når innlogging forsøkes. %%uid erstatter brukernavnet i innloggingshandlingen. Eksempel: \"uid=%%uid\"",
 "Add Server Configuration" => "Legg til tjener-konfigurasjon",
 "Host" => "Tjener",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://",
@@ -28,23 +53,55 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "For anonym tilgang, la DN- og passord-feltet stå tomt.",
 "One Base DN per line" => "En hoved DN pr. linje",
 "You can specify Base DN for users and groups in the Advanced tab" => "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen",
+"The filter specifies which LDAP users shall have access to the %s instance." => "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.",
+"users found" => "brukere funnet",
 "Back" => "Tilbake",
 "Continue" => "Fortsett",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Advarsel:</b> Appene user_ldap og user_webdavauth er ikke kompatible med hverandre. Uventet oppførsel kan forekomme. Be systemadministratoren om å deaktivere en av dem.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den.",
+"Connection Settings" => "Innstillinger for tilkobling",
 "Configuration Active" => "Konfigurasjon aktiv",
 "When unchecked, this configuration will be skipped." => "Når ikke huket av så vil denne konfigurasjonen bli hoppet over.",
 "Backup (Replica) Host" => "Sikkerhetskopierings (Replica) vert",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Oppgi en valgfri reservetjener. Den må være en replika av hovedtjeneren for LDAP/AD.",
+"Backup (Replica) Port" => "Reserve (Replika) Port",
+"Disable Main Server" => "Deaktiver hovedtjeneren",
+"Only connect to the replica server." => "Koble til bare replika-tjeneren.",
 "Case insensitve LDAP server (Windows)" => "Case-insensitiv LDAP tjener (Windows)",
 "Turn off SSL certificate validation." => "Slå av SSL-sertifikat validering",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Ikke anbefalt, bruk kun for testing! Hvis tilkobling bare virker med dette valget, importer LDAP-tjenerens SSL-sertifikat i %s-serveren din.",
+"Cache Time-To-Live" => "Levetid i mellomlager",
 "in seconds. A change empties the cache." => "i sekunder. En endring tømmer bufferen.",
+"Directory Settings" => "Innstillinger for Katalog",
 "User Display Name Field" => "Vis brukerens navnfelt",
+"The LDAP attribute to use to generate the user's display name." => "LDAP-attributten som skal brukes til å generere brukerens visningsnavn.",
 "Base User Tree" => "Hovedbruker tre",
 "One User Base DN per line" => "En Bruker Base DN pr. linje",
+"User Search Attributes" => "Attributter for brukersøk",
+"Optional; one attribute per line" => "Valgfritt, en attributt pr. linje",
 "Group Display Name Field" => "Vis gruppens navnfelt",
+"The LDAP attribute to use to generate the groups's display name." => "LDAP-attributten som skal brukes til å generere gruppens visningsnavn.",
 "Base Group Tree" => "Hovedgruppe tre",
 "One Group Base DN per line" => "En gruppe hoved-DN pr. linje",
+"Group Search Attributes" => "Attributter for gruppesøk",
 "Group-Member association" => "gruppe-medlem assosiasjon",
+"Special Attributes" => "Spesielle attributter",
+"Quota Field" => "Felt med lagringskvote",
+"Quota Default" => "Standard lagringskvote",
 "in bytes" => "i bytes",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt."
+"Email Field" => "Felt med e-postadresse",
+"User Home Folder Naming Rule" => "Navneregel for brukers hjemmemappe",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt.",
+"Internal Username" => "Internt brukernavn",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Som standard vil det interne brukernavnet bli laget utifra UUID-attributten. Dette sikrer at brukernavnet er unikt og at det ikke er nødvendig å konvertere tegn. Det interne brukernavnet har den begrensningen at bare disse tegnene er tillatt: [ a-zA-Z0-9_.@- ]. Andre tegn erstattes av tilsvarende ASCII-tegn eller blir ganske enkelt utelatt. Ved kollisjon blir et nummer lagt til / øket. Det interne brukernavnet brukes til å identifisere en bruker internt. Det er også standardnavnet på brukerens hjemmemappe. Det er også med i fjern-URL-er, for eksempel for alle *DAV-tjenester. Med denne innstillingen kan standard oppførsel overstyres. For å få en oppførsel som likner oppførselen før ownCloud 5, legg inn attributten for brukerens visningsnavn i dette feltet. La feltet stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere.",
+"Internal Username Attribute:" => "Attributt for internt brukernavn:",
+"Override UUID detection" => "Overstyr UUID-oppdaging",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Som standard blir UUID-attributten oppdaget automatisk. UUID-attributten brukes til å identifisere LDAP-brukere og -grupper uten tvil. Det interne brukernavnet vil også bli laget basert på UUID, hvis ikke annet er spesifisert ovenfor. Du kan overstyre innstillingen og oppgi den attributten du ønsker. Du må forsikre det om at din valgte attributt kan hentes ut både for brukere og for grupper og at den er unik. La stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere og -grupper.",
+"UUID Attribute for Users:" => "UUID-attributt for brukere:",
+"UUID Attribute for Groups:" => "UUID-attributt for grupper:",
+"Username-LDAP User Mapping" => "Tilknytning av brukernavn til LDAP-bruker",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Brukernavn brukes til å lagre og tilordne (meta)data. For at brukere skal identifiseres og gjenkjennes presist, vil hver LDAP-bruker ha et internt brukernavn. Dette krever en tilknytning fra brukernavn til LDAP-bruker. Brukernavn som opprettes blir knyttet til LDAP-brukerens UUID. I tillegg mellomlagres DN for å redusere LDAP-kommunikasjon, men det brukes ikke til identifisering. Hvis DN endres vil endringene bli oppdaget. Det interne brukernavnet brukes alle steder. Nullstilling av tilknytningene vil etterlate seg rester overalt. Nullstilling av tilknytningene skjer ikke pr. konfigurasjon, det påvirker alle LDAP-konfigurasjoner! Nullstill aldri tilknytningene i et produksjonsmiljø, kun ved testing eller eksperimentering.",
+"Clear Username-LDAP User Mapping" => "Nullstill tilknytning av brukernavn til LDAP-bruker",
+"Clear Groupname-LDAP Group Mapping" => "Nullstill tilknytning av gruppenavn til LDAP-gruppe"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index bfe96f4268..55e4e07033 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Bewaren",
 "Test Configuration" => "Test configuratie",
 "Help" => "Help",
-"Limit the access to %s to groups meeting this criteria:" => "Beperk toegang tot %s tot groepen die voldoen aan deze criteria:",
+"Groups meeting these criteria are available in %s:" => "Groepsafspraken die voldoen aan deze criteria zijn beschikbaar in %s:",
 "only those object classes:" => "alleen deze objectklassen",
 "only from those groups:" => "alleen van deze groepen:",
 "Edit raw filter instead" => "Bewerk raw filter",
 "Raw LDAP filter" => "Raw LDAP filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Dit filter geeft aan welke LDAP groepen toegang hebben tot %s.",
 "groups found" => "groepen gevonden",
-"What attribute shall be used as login name:" => "Welk attribuut moet worden gebruikt als inlognaam:",
+"Users login with this attribute:" => "Gebruikers loggen in met dit attribuut:",
 "LDAP Username:" => "LDAP Username:",
 "LDAP Email Address:" => "LDAP e-mailadres:",
 "Other Attributes:" => "Overige attributen:",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Voor anonieme toegang, laat de DN en het wachtwoord leeg.",
 "One Base DN per line" => "Een Base DN per regel",
 "You can specify Base DN for users and groups in the Advanced tab" => "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd.",
-"Limit the access to %s to users meeting this criteria:" => "Beperk toegang tot %s tot gebruikers die voldoen aan deze criteria:",
+"Limit %s access to users meeting these criteria:" => "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.",
 "users found" => "gebruikers gevonden",
 "Back" => "Terug",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Een Group Base DN per regel",
 "Group Search Attributes" => "Attributen voor groepszoekopdrachten",
 "Group-Member association" => "Groepslid associatie",
+"Nested Groups" => "Geneste groepen",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Wanneer ingeschakeld worden groepen binnen groepen ondersteund. (Werkt alleen als het groepslid attribuut DNs bevat)",
 "Special Attributes" => "Speciale attributen",
 "Quota Field" => "Quota veld",
 "Quota Default" => "Quota standaard",
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 056718a027..5c6d3d7022 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -4,6 +4,11 @@ $TRANSLATIONS = array(
 "Failed to delete the server configuration" => "Nie można usunąć konfiguracji serwera",
 "The configuration is valid and the connection could be established!" => "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.",
+"The configuration is invalid. Please have a look at the logs for further details." => "Konfiguracja jest nieprawidłowa. Proszę rzucić okiem na dzienniki dalszych szczegółów.",
+"No action specified" => "Nie określono akcji",
+"No configuration specified" => "Nie określono konfiguracji",
+"No data specified" => "Nie określono danych",
+" Could not set configuration %s" => "Nie można ustawić konfiguracji %s",
 "Deletion failed" => "Usunięcie nie powiodło się",
 "Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
 "Keep settings?" => "Zachować ustawienia?",
@@ -11,16 +16,35 @@ $TRANSLATIONS = array(
 "mappings cleared" => "Mapoanie wyczyszczone",
 "Success" => "Sukces",
 "Error" => "Błąd",
+"Configuration OK" => "Konfiguracja poprawna",
+"Configuration incorrect" => "Konfiguracja niepoprawna",
+"Configuration incomplete" => "Konfiguracja niekompletna",
 "Select groups" => "Wybierz grupy",
+"Select object classes" => "Wybierz obiekty klas",
+"Select attributes" => "Wybierz atrybuty",
 "Connection test succeeded" => "Test połączenia udany",
 "Connection test failed" => "Test połączenia nie udany",
 "Do you really want to delete the current Server Configuration?" => "Czy chcesz usunąć bieżącą konfigurację serwera?",
 "Confirm Deletion" => "Potwierdź usunięcie",
-"_%s group found_::_%s groups found_" => array("","",""),
-"_%s user found_::_%s users found_" => array("","",""),
+"_%s group found_::_%s groups found_" => array("%s znaleziona grupa","%s znalezionych grup","%s znalezionych grup"),
+"_%s user found_::_%s users found_" => array("%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"),
+"Invalid Host" => "Niepoprawny Host",
+"Could not find the desired feature" => "Nie można znaleźć żądanej funkcji",
 "Save" => "Zapisz",
 "Test Configuration" => "Konfiguracja testowa",
 "Help" => "Pomoc",
+"Groups meeting these criteria are available in %s:" => "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:",
+"only those object classes:" => "tylko te klasy obiektów:",
+"only from those groups:" => "tylko z tych grup:",
+"Edit raw filter instead" => "Edytuj zamiast tego czysty filtr",
+"Raw LDAP filter" => "Czysty filtr LDAP",
+"The filter specifies which LDAP groups shall have access to the %s instance." => "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.",
+"groups found" => "grup znaleziono",
+"Users login with this attribute:" => "Użytkownicy zalogowani z tymi ustawieniami:",
+"LDAP Username:" => "Nazwa użytkownika LDAP:",
+"LDAP Email Address:" => "LDAP Adres Email:",
+"Other Attributes:" => "Inne atrybuty:",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"",
 "Add Server Configuration" => "Dodaj konfigurację servera",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
@@ -31,8 +55,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Dla dostępu anonimowego pozostawić DN i hasło puste.",
 "One Base DN per line" => "Jedna baza DN na linię",
 "You can specify Base DN for users and groups in the Advanced tab" => "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane",
+"Limit %s access to users meeting these criteria:" => "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:",
+"The filter specifies which LDAP users shall have access to the %s instance." => "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s.",
+"users found" => "użytkownicy znalezieni",
 "Back" => "Wróć",
 "Continue" => "Kontynuuj ",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są  kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b>  Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go.",
 "Connection Settings" => "Konfiguracja połączeń",
 "Configuration Active" => "Konfiguracja archiwum",
@@ -44,19 +72,24 @@ $TRANSLATIONS = array(
 "Only connect to the replica server." => "Połącz tylko do repliki serwera.",
 "Case insensitve LDAP server (Windows)" => "Wielkość liter serwera LDAP (Windows)",
 "Turn off SSL certificate validation." => "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nie polecane, używać tylko w celu testowania! Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP na swój %s.",
 "Cache Time-To-Live" => "Przechowuj czas życia",
 "in seconds. A change empties the cache." => "w sekundach. Zmiana opróżnia pamięć podręczną.",
 "Directory Settings" => "Ustawienia katalogów",
 "User Display Name Field" => "Pole wyświetlanej nazwy użytkownika",
+"The LDAP attribute to use to generate the user's display name." => "Atrybut LDAP służący do generowania wyświetlanej nazwy użytkownika ownCloud.",
 "Base User Tree" => "Drzewo bazy użytkowników",
 "One User Base DN per line" => "Jeden użytkownik Bazy DN na linię",
 "User Search Attributes" => "Szukaj atrybutów",
 "Optional; one attribute per line" => "Opcjonalnie; jeden atrybut w wierszu",
 "Group Display Name Field" => "Pole wyświetlanej nazwy grupy",
+"The LDAP attribute to use to generate the groups's display name." => "Atrybut LDAP służący do generowania wyświetlanej nazwy grupy ownCloud.",
 "Base Group Tree" => "Drzewo bazy grup",
 "One Group Base DN per line" => "Jedna grupa bazy DN na linię",
 "Group Search Attributes" => "Grupa atrybutów wyszukaj",
 "Group-Member association" => "Członek grupy stowarzyszenia",
+"Nested Groups" => "Grupy zagnieżdżone",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Kiedy włączone, grupy, które zawierają grupy, są wspierane. (Działa tylko, jeśli członek grupy ma ustawienie DNs)",
 "Special Attributes" => "Specjalne atrybuty",
 "Quota Field" => "Pole przydziału",
 "Quota Default" => "Przydział domyślny",
@@ -65,11 +98,14 @@ $TRANSLATIONS = array(
 "User Home Folder Naming Rule" => "Reguły nazewnictwa folderu domowego użytkownika",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD.",
 "Internal Username" => "Wewnętrzna nazwa użytkownika",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Domyślnie, wewnętrzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna, a znaki nie muszą być konwertowane. Wewnętrzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. Pozostałe znaki zamieniane są na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa się powtarza na końcu jest dodawana / zwiększana cyfra. Wewnętrzna nazwa użytkownika służy do wewnętrznej identyfikacji użytkownika. Jest to również domyślna nazwa folderu domowego użytkownika. Jest to również część zdalnego adresu URL, na przykład dla wszystkich usług *DAV. Dzięki temu ustawieniu można nadpisywać domyślne zachowanie aplikacji. Aby osiągnąć podobny efekt jak przed ownCloud 5 wpisz atrybut nazwy użytkownika w poniższym polu. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników LDAP.",
 "Internal Username Attribute:" => "Wewnętrzny atrybut nazwy uzżytkownika:",
 "Override UUID detection" => "Zastąp wykrywanie UUID",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "Domyślnie, atrybut UUID jest wykrywany automatycznie. Atrybut UUID jest używany do niepodważalnej identyfikacji użytkowników i grup LDAP. Również wewnętrzna nazwa użytkownika zostanie stworzona na bazie UUID, jeśli nie zostanie podana powyżej. Możesz nadpisać to ustawienie i użyć atrybutu wedle uznania. Musisz się jednak upewnić, że atrybut ten może zostać pobrany zarówno dla użytkowników, jak i grup i jest unikalny. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników i grupy LDAP.",
 "UUID Attribute for Users:" => "Atrybuty UUID dla użytkowników:",
 "UUID Attribute for Groups:" => "Atrybuty UUID dla grup:",
 "Username-LDAP User Mapping" => "Mapowanie użytkownika LDAP",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Nazwy użytkowników są używane w celu przechowywania i przypisywania (meta) danych. Aby dokładnie zidentyfikować i rozpoznać użytkowników, każdy użytkownik LDAP będzie miał wewnętrzną nazwę. To wymaga utworzenia przypisania nazwy użytkownika do użytkownika LDAP. Utworzona nazwa użytkownika jet przypisywana do UUID użytkownika LDAP. Dodatkowo DN jest również buforowany aby zmniejszyć interakcję z LDAP, ale nie jest używany do identyfikacji. Jeśli DN się zmieni, zmiany zostaną odnalezione. Wewnętrzny użytkownik jest używany we wszystkich przypadkach. Wyczyszczenie mapowań spowoduje pozostawienie wszędzie resztek informacji. Wyczyszczenie mapowań nie jest wrażliwe na konfigurację, wpływa ono na wszystkie konfiguracje LDAP! Nigdy nie czyść mapowań w środowisku produkcyjnym, tylko podczas testów lub w fazie eksperymentalnej. ",
 "Clear Username-LDAP User Mapping" => "Czyść Mapowanie użytkownika LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Czyść Mapowanie nazwy grupy LDAP"
 );
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 559dc949bd..786bee4c8a 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Guardar",
 "Test Configuration" => "Teste de Configuração",
 "Help" => "Ajuda",
-"Limit the access to %s to groups meeting this criteria:" => "Limitar o acesso a %s para grupos que coincidam com estes critérios:",
+"Groups meeting these criteria are available in %s:" => "Grupos que satisfazem estes critérios estão disponíveis em %s:",
 "only those object classes:" => "apenas essas classes de objetos:",
 "only from those groups:" => "apenas a partir dos grupos:",
 "Edit raw filter instead" => "Editar filtro raw ao invéz",
 "Raw LDAP filter" => "Filtro LDAP Raw",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.",
 "groups found" => "grupos encontrados",
-"What attribute shall be used as login name:" => "O atributo deve ser usado como nome de login:",
+"Users login with this attribute:" => "Usuários entrar com este atributo:",
 "LDAP Username:" => "Usuário LDAP:",
 "LDAP Email Address:" => "LDAP Endereço de E-mail:",
 "Other Attributes:" => "Outros atributos:",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Para acesso anônimo, deixe DN e Senha vazios.",
 "One Base DN per line" => "Uma base DN por linha",
 "You can specify Base DN for users and groups in the Advanced tab" => "Você pode especificar DN Base para usuários e grupos na guia Avançada",
-"Limit the access to %s to users meeting this criteria:" => "Limitar o acesso a %s para usuários que coincidam com estes critérios:",
+"Limit %s access to users meeting these criteria:" => "Limitar o acesso %s para usuários que satisfazem esses critérios:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.",
 "users found" => "usuários encontrados",
 "Back" => "Voltar",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Um grupo-base DN por linha",
 "Group Search Attributes" => "Atributos de Busca de Grupo",
 "Group-Member association" => "Associação Grupo-Membro",
+"Nested Groups" => "Grupos Aninhados",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quando habilitado, os grupos que contêm os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)",
 "Special Attributes" => "Atributos Especiais",
 "Quota Field" => "Campo de Cota",
 "Quota Default" => "Cota Padrão",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 89c37358b6..37142c8175 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -1,9 +1,13 @@
 <?php
 $TRANSLATIONS = array(
 "Failed to clear the mappings." => "Falhou a limpar os mapas",
-"Failed to delete the server configuration" => "Erro ao eliminar as configurações do servidor",
+"Failed to delete the server configuration" => "Erro ao eliminar a configuração do servidor",
 "The configuration is valid and the connection could be established!" => "A configuração está correcta e foi possível estabelecer a ligação!",
 "The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração está correcta, mas não foi possível estabelecer o \"laço\", por favor, verifique as configurações do servidor e as credenciais.",
+"No action specified" => "Nenhuma acção especificada",
+"No configuration specified" => "Nenhuma configuração especificada",
+"No data specified" => "Nenhuma data especificada",
+" Could not set configuration %s" => "Não foi possível definir a configuração %s",
 "Deletion failed" => "Erro ao apagar",
 "Take over settings from recent server configuration?" => "Assumir as configurações da configuração do servidor mais recente?",
 "Keep settings?" => "Manter as definições?",
@@ -11,16 +15,33 @@ $TRANSLATIONS = array(
 "mappings cleared" => "Mapas limpos",
 "Success" => "Sucesso",
 "Error" => "Erro",
+"Configuration OK" => "Configuração OK",
+"Configuration incorrect" => "Configuração incorreta",
+"Configuration incomplete" => "Configuração incompleta",
 "Select groups" => "Seleccionar grupos",
+"Select object classes" => "Selecionar classes de objetos",
+"Select attributes" => "Selecionar atributos",
 "Connection test succeeded" => "Teste de conecção passado com sucesso.",
 "Connection test failed" => "Erro no teste de conecção.",
 "Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configurações de servidor actuais?",
 "Confirm Deletion" => "Confirmar a operação de apagar",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
+"_%s group found_::_%s groups found_" => array("%s grupo encontrado","%s grupos encontrados"),
+"_%s user found_::_%s users found_" => array("%s utilizador encontrado","%s utilizadores encontrados"),
+"Invalid Host" => "Hospedeiro Inválido",
+"Could not find the desired feature" => "Não se encontrou a função desejada",
 "Save" => "Guardar",
 "Test Configuration" => "Testar a configuração",
 "Help" => "Ajuda",
+"only those object classes:" => "apenas essas classes de objetos:",
+"only from those groups:" => "apenas desses grupos:",
+"Edit raw filter instead" => "Editar filtro raw em vez disso",
+"Raw LDAP filter" => "Filtro LDAP Raw",
+"The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica quais grupos LDAP devem ter acesso à instância %s.",
+"groups found" => "grupos encontrados",
+"LDAP Username:" => "Nome de utilizador LDAP:",
+"LDAP Email Address:" => "Endereço de correio eletrónico LDAP:",
+"Other Attributes:" => "Outros Atributos:",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\"",
 "Add Server Configuration" => "Adicionar configurações do servidor",
 "Host" => "Anfitrião",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
@@ -31,8 +52,10 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
 "One Base DN per line" => "Uma base DN por linho",
 "You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar o ND Base para utilizadores e grupos no separador Avançado",
+"users found" => "utilizadores encontrados",
 "Back" => "Voltar",
 "Continue" => "Continuar",
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar.",
 "Connection Settings" => "Definições de ligação",
 "Configuration Active" => "Configuração activa",
@@ -41,17 +64,20 @@ $TRANSLATIONS = array(
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Forneça um servidor (anfitrião) de backup. Deve ser uma réplica do servidor principal de LDAP/AD ",
 "Backup (Replica) Port" => "Porta do servidor de backup (Replica)",
 "Disable Main Server" => "Desactivar servidor principal",
+"Only connect to the replica server." => "Ligar apenas ao servidor de réplicas.",
 "Case insensitve LDAP server (Windows)" => "Servidor LDAP (Windows) não sensível a maiúsculas.",
 "Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.",
 "Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor",
 "in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.",
 "Directory Settings" => "Definições de directorias",
 "User Display Name Field" => "Mostrador do nome de utilizador.",
+"The LDAP attribute to use to generate the user's display name." => "Atributo LDAP para gerar o nome de utilizador do ownCloud.",
 "Base User Tree" => "Base da árvore de utilizadores.",
 "One User Base DN per line" => "Uma base de utilizador DN por linha",
 "User Search Attributes" => "Utilizar atributos de pesquisa",
 "Optional; one attribute per line" => "Opcional; Um atributo por linha",
 "Group Display Name Field" => "Mostrador do nome do grupo.",
+"The LDAP attribute to use to generate the groups's display name." => "Atributo LDAP para gerar o nome do grupo do ownCloud.",
 "Base Group Tree" => "Base da árvore de grupos.",
 "One Group Base DN per line" => "Uma base de grupo DN por linha",
 "Group Search Attributes" => "Atributos de pesquisa de grupo",
@@ -64,8 +90,11 @@ $TRANSLATIONS = array(
 "User Home Folder Naming Rule" => "Regra da pasta inicial do utilizador",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
 "Internal Username" => "Nome de utilizador interno",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres não necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituídos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para utilizadores mapeados (adicionados) LDAP.",
 "Internal Username Attribute:" => "Atributo do nome de utilizador interno",
 "Override UUID detection" => "Passar a detecção do UUID",
+"UUID Attribute for Users:" => "Atributo UUID para utilizadores:",
+"UUID Attribute for Groups:" => "Atributo UUID para grupos:",
 "Username-LDAP User Mapping" => "Mapeamento do utilizador LDAP",
 "Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP",
 "Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP"
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 7b9cf8ceb5..d9685368cb 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -33,14 +33,12 @@ $TRANSLATIONS = array(
 "Save" => "Сохранить",
 "Test Configuration" => "Проверить конфигурацию",
 "Help" => "Помощь",
-"Limit the access to %s to groups meeting this criteria:" => "Ограничить доступ к %s группам, удовлетворяющим этому критерию:",
 "only those object classes:" => "только эти объектные классы",
 "only from those groups:" => "только из этих групп",
 "Edit raw filter instead" => "Редактировать исходный фильтр",
 "Raw LDAP filter" => "Исходный LDAP фильтр",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
 "groups found" => "групп найдено",
-"What attribute shall be used as login name:" => "Какой атрибут должен быть использован для логина:",
 "LDAP Username:" => "Имя пользователя LDAP",
 "LDAP Email Address:" => "LDAP адрес электронной почты:",
 "Other Attributes:" => "Другие атрибуты:",
@@ -55,7 +53,6 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте DN и пароль пустыми.",
 "One Base DN per line" => "По одной базе поиска (Base DN) в строке.",
 "You can specify Base DN for users and groups in the Advanced tab" => "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"",
-"Limit the access to %s to users meeting this criteria:" => "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.",
 "users found" => "пользователей найдено",
 "Back" => "Назад",
@@ -99,7 +96,7 @@ $TRANSLATIONS = array(
 "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для папки пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
 "Internal Username Attribute:" => "Атрибут для внутреннего имени:",
 "Override UUID detection" => "Переопределить нахождение UUID",
-"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
 "UUID Attribute for Users:" => "UUID-атрибуты для пользователей:",
 "UUID Attribute for Groups:" => "UUID-атрибуты для групп:",
 "Username-LDAP User Mapping" => "Соответствия Имя-Пользователь LDAP",
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
index 850fce24c4..460064593e 100644
--- a/apps/user_ldap/l10n/sk_SK.php
+++ b/apps/user_ldap/l10n/sk_SK.php
@@ -16,7 +16,7 @@ $TRANSLATIONS = array(
 "mappings cleared" => "mapovanie vymazané",
 "Success" => "Úspešné",
 "Error" => "Chyba",
-"Configuration OK" => "Konfigurácia je vporiadku",
+"Configuration OK" => "Konfigurácia je v poriadku",
 "Configuration incorrect" => "Nesprávna konfigurácia",
 "Configuration incomplete" => "Nekompletná konfigurácia",
 "Select groups" => "Vybrať skupinu",
@@ -33,21 +33,19 @@ $TRANSLATIONS = array(
 "Save" => "Uložiť",
 "Test Configuration" => "Test nastavenia",
 "Help" => "Pomoc",
-"Limit the access to %s to groups meeting this criteria:" => "Obmedziť prístup %s do skupiny, ktoré spĺňajú tieto kritériá:",
 "only those object classes:" => "len tieto triedy objektov:",
 "only from those groups:" => "len z týchto skupín:",
 "Edit raw filter instead" => "Miesto pre úpravu raw filtra",
 "Raw LDAP filter" => "Raw LDAP filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
 "groups found" => "nájdené skupiny",
-"What attribute shall be used as login name:" => "Ako prihlasovacie meno použiť atribút:",
 "LDAP Username:" => "LDAP používateľské meno:",
 "LDAP Email Address:" => "LDAP emailová adresa:",
 "Other Attributes:" => "Iné atribúty:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
 "Add Server Configuration" => "Pridať nastavenia servera.",
 "Host" => "Hostiteľ",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Môžete vynechať protokol, s výnimkou požadovania SSL. Vtedy začnite s ldaps://",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Môžete vynechať protokol, okrem prípadu, kedy sa vyžaduje SSL. Vtedy začnite s ldaps://",
 "Port" => "Port",
 "User DN" => "Používateľské DN",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
@@ -55,13 +53,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
 "One Base DN per line" => "Jedno základné DN na riadok",
 "You can specify Base DN for users and groups in the Advanced tab" => "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny",
-"Limit the access to %s to users meeting this criteria:" => "Obmedziť prístup k %s na používateľov, ktorí spĺňajú tieto kritériá:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.",
 "users found" => "nájdení používatelia",
 "Back" => "Späť",
 "Continue" => "Pokračovať",
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." => "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požádejte administrátora systému aby ho nainštaloval.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požiadajte administrátora systému, aby ho nainštaloval.",
 "Connection Settings" => "Nastavenie pripojenia",
 "Configuration Active" => "Nastavenia sú aktívne ",
 "When unchecked, this configuration will be skipped." => "Ak nie je zaškrtnuté, nastavenie bude preskočené.",
@@ -73,10 +70,10 @@ $TRANSLATIONS = array(
 "Case insensitve LDAP server (Windows)" => "LDAP server nerozlišuje veľkosť znakov (Windows)",
 "Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.",
 "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.",
-"Cache Time-To-Live" => "Životnosť objektov v medzipamäti",
+"Cache Time-To-Live" => "Životnosť objektov vo vyrovnávacej pamäti",
 "in seconds. A change empties the cache." => "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.",
-"Directory Settings" => "Nastavenie priečinka",
-"User Display Name Field" => "Pole pre zobrazenie mena používateľa",
+"Directory Settings" => "Nastavenia priečinka",
+"User Display Name Field" => "Pole pre zobrazované meno používateľa",
 "The LDAP attribute to use to generate the user's display name." => "Atribút LDAP použitý na vygenerovanie zobrazovaného mena používateľa. ",
 "Base User Tree" => "Základný používateľský strom",
 "One User Base DN per line" => "Jedna používateľská základná DN na riadok",
@@ -94,16 +91,16 @@ $TRANSLATIONS = array(
 "in bytes" => "v bajtoch",
 "Email Field" => "Pole emailu",
 "User Home Folder Naming Rule" => "Pravidlo pre nastavenie názvu používateľského priečinka dát",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút z LDAP/AD.",
 "Internal Username" => "Interné používateľské meno",
-"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov.",
+"By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." => "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby *DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov.",
 "Internal Username Attribute:" => "Atribút interného používateľského mena:",
 "Override UUID detection" => "Prepísať UUID detekciu",
-"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné použivateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri použivateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP.",
+"By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." => "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné používateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri používateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP.",
 "UUID Attribute for Users:" => "UUID atribút pre používateľov:",
 "UUID Attribute for Groups:" => "UUID atribút pre skupiny:",
 "Username-LDAP User Mapping" => "Mapovanie názvov LDAP používateľských mien",
-"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Použivateľské mená sa používajú pre uchovávanie a priraďovanie (meta)dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapování vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze.",
+"Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." => "Používateľské mená sa používajú pre uchovávanie a priraďovanie (meta) dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapovaní vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze.",
 "Clear Username-LDAP User Mapping" => "Zrušiť mapovanie LDAP používateľských mien",
 "Clear Groupname-LDAP Group Mapping" => "Zrušiť mapovanie názvov LDAP skupín"
 );
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index b51c5bc7bb..b6df62ffb7 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -33,14 +33,12 @@ $TRANSLATIONS = array(
 "Save" => "Shrani",
 "Test Configuration" => "Preizkusne nastavitve",
 "Help" => "Pomoč",
-"Limit the access to %s to groups meeting this criteria:" => "Omeji dostop %s do skupin glede na kriterij:",
 "only those object classes:" => "le razredi predmeta:",
 "only from those groups:" => "le iz skupin:",
 "Edit raw filter instead" => "Uredi surov filter",
 "Raw LDAP filter" => "Surovi filter LDAP",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
 "groups found" => "najdenih skupin",
-"What attribute shall be used as login name:" => "Kateri atribut naj bo uporabljen kot prijavno ime:",
 "LDAP Username:" => "Uporabniško ime LDAP:",
 "LDAP Email Address:" => "Elektronski naslov LDAP:",
 "Other Attributes:" => "Drugi atributi:",
@@ -55,7 +53,6 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Za brezimni dostop naj bosta polji imena in gesla prazni.",
 "One Base DN per line" => "Eno osnovno enolično ime na vrstico",
 "You can specify Base DN for users and groups in the Advanced tab" => "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.",
-"Limit the access to %s to users meeting this criteria:" => "Omeji dostop do %s uporabnikom, za katere velja kriterij:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
 "users found" => "najdenih uporabnikov",
 "Back" => "Nazaj",
@@ -88,6 +85,7 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Eno osnovno ime skupine na vrstico",
 "Group Search Attributes" => "Skupinski atributi iskanja",
 "Group-Member association" => "Povezava član-skupina",
+"Nested Groups" => "Gnezdene skupine",
 "Special Attributes" => "Posebni atributi",
 "Quota Field" => "Polje količinske omejitve",
 "Quota Default" => "Privzeta količinska omejitev",
diff --git a/apps/user_ldap/l10n/su.php b/apps/user_ldap/l10n/su.php
new file mode 100644
index 0000000000..bba52d53a1
--- /dev/null
+++ b/apps/user_ldap/l10n/su.php
@@ -0,0 +1,6 @@
+<?php
+$TRANSLATIONS = array(
+"_%s group found_::_%s groups found_" => array(""),
+"_%s user found_::_%s users found_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index 62beec274e..0108cfcb0e 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -33,12 +33,12 @@ $TRANSLATIONS = array(
 "Save" => "Spara",
 "Test Configuration" => "Testa konfigurationen",
 "Help" => "Hjälp",
-"Limit the access to %s to groups meeting this criteria:" => "Begränsa åtkomsten till %s till grupper som möter följande kriterie:",
 "only those object classes:" => "Endast de objekt-klasserna:",
 "only from those groups:" => "endast ifrån de här grupperna:",
+"Edit raw filter instead" => "Redigera rått filter istället",
+"Raw LDAP filter" => "Rått LDAP-filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filtret specifierar vilka LDAD-grupper som ska ha åtkomst till %s instans",
 "groups found" => "grupper hittade",
-"What attribute shall be used as login name:" => "Vilket attribut ska användas som login namn:",
 "LDAP Username:" => "LDAP användarnamn:",
 "LDAP Email Address:" => "LDAP e-postadress:",
 "Other Attributes:" => "Övriga attribut:",
@@ -53,7 +53,6 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.",
 "One Base DN per line" => "Ett Start DN per rad",
 "You can specify Base DN for users and groups in the Advanced tab" => "Du kan ange start DN för användare och grupper under fliken Avancerat",
-"Limit the access to %s to users meeting this criteria:" => "Begränsa åtkomsten till %s till användare som möter följande kriterie:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Filtret specifierar vilka LDAP-användare som skall ha åtkomst till %s instans",
 "users found" => "användare funna",
 "Back" => "Tillbaka",
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
index ad3ffb1c5e..e154c06873 100644
--- a/apps/user_ldap/l10n/te.php
+++ b/apps/user_ldap/l10n/te.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("",""),
 "Save" => "భద్రపరచు",
 "Help" => "సహాయం",
-"Password" => "సంకేతపదం"
+"Password" => "సంకేతపదం",
+"Continue" => "కొనసాగించు"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 8299c5feca..fa829a7427 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -33,14 +33,14 @@ $TRANSLATIONS = array(
 "Save" => "Kaydet",
 "Test Configuration" => "Test Yapılandırması",
 "Help" => "Yardım",
-"Limit the access to %s to groups meeting this criteria:" => "%s erişimini, şu kriterle eşleşen gruplara sınırla:",
+"Groups meeting these criteria are available in %s:" => "Bu kriterle eşleşen gruplar %s içinde mevcut:",
 "only those object classes:" => "sadece bu nesne sınıflarına:",
 "only from those groups:" => "sadece bu gruplardan:",
 "Edit raw filter instead" => "Bunun yerine ham filtreyi düzenle",
 "Raw LDAP filter" => "Ham LDAP filtresi",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
 "groups found" => "grup bulundu",
-"What attribute shall be used as login name:" => "Oturum ismi olarak hangi nitelik kullanılmalı:",
+"Users login with this attribute:" => "Bu nitelikle oturum açan kullanıcılar:",
 "LDAP Username:" => "LDAP Kullanıcı Adı:",
 "LDAP Email Address:" => "LDAP E-posta Adresi:",
 "Other Attributes:" => "Diğer Nitelikler",
@@ -55,7 +55,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
 "One Base DN per line" => "Bir Tabani DN herbir dizi. ",
 "You can specify Base DN for users and groups in the Advanced tab" => "Base DN kullanicileri  ve kaynaklari icin tablosu Advanced tayin etmek ederiz. ",
-"Limit the access to %s to users meeting this criteria:" => "%s erişimini, şu kriterle eşleşen kullanıcılara sınırla:",
+"Limit %s access to users meeting these criteria:" => "%s erişimini, şu kriterle eşleşen kullanıcılara sınırla:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
 "users found" => "kullanıcı bulundu",
 "Back" => "Geri",
@@ -88,6 +88,8 @@ $TRANSLATIONS = array(
 "One Group Base DN per line" => "Bir Grubu Tabani DN her dizgi. ",
 "Group Search Attributes" => "Kategorii Arama Grubu",
 "Group-Member association" => "Grup-Üye işbirliği",
+"Nested Groups" => "İç içe Gruplar",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Etkinleştirildiğinde, grup içeren gruplar desteklenir (Sadece grup üyesi DN niteliği içeriyorsa çalışır).",
 "Special Attributes" => "Özel Öznitelikler",
 "Quota Field" => "Kota Alanı",
 "Quota Default" => "Öntanımlı Kota",
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
index f1f069cc4d..84d001cb59 100644
--- a/apps/user_ldap/l10n/vi.php
+++ b/apps/user_ldap/l10n/vi.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Cho phép truy cập nặc danh , DN và mật khẩu trống.",
 "You can specify Base DN for users and groups in the Advanced tab" => "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced",
 "Back" => "Trở lại",
+"Continue" => "Tiếp tục",
 "Connection Settings" => "Connection Settings",
 "Backup (Replica) Port" => "Cổng sao lưu (Replica)",
 "Disable Main Server" => "Tắt máy chủ chính",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index f1a3625bf3..aae100ef9a 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "One Base DN per line" => "每行一个基本判别名",
 "You can specify Base DN for users and groups in the Advanced tab" => "您可以在高级选项卡里为用户和组指定Base DN",
 "Back" => "返回",
+"Continue" => "继续",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告：</b> PHP LDAP 模块未安装，后端将无法工作。请请求您的系统管理员安装该模块。",
 "Connection Settings" => "连接设置",
 "Configuration Active" => "现行配置",
@@ -40,6 +41,7 @@ $TRANSLATIONS = array(
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。",
 "Backup (Replica) Port" => "备份 (镜像) 端口",
 "Disable Main Server" => "禁用主服务器",
+"Only connect to the replica server." => "只能连接到复制服务器",
 "Case insensitve LDAP server (Windows)" => "大小写敏感LDAP服务器(Windows)",
 "Turn off SSL certificate validation." => "关闭SSL证书验证",
 "Cache Time-To-Live" => "缓存存活时间",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index b7e4023dd7..4d187bab8d 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1064,8 +1064,8 @@ class Access extends LDAPUtility {
 			return true;
 		}
 
-		//for now, supported attributes are entryUUID, nsuniqueid, objectGUID
-		$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid');
+		//for now, supported attributes are entryUUID, nsuniqueid, objectGUID, ipaUniqueID
+		$testAttributes = array('entryuuid', 'nsuniqueid', 'objectguid', 'guid', 'ipauniqueid');
 
 		foreach($testAttributes as $attribute) {
 			$value = $this->readAttribute($dn, $attribute);
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index 612a623e91..d42b1c0582 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -119,9 +119,9 @@ class Configuration {
 
 		$cta = $this->getConfigTranslationArray();
 		foreach($config as $inputkey => $val) {
-			if(strpos($inputkey, '_') !== false && isset($cta[$inputkey])) {
+			if(strpos($inputkey, '_') !== false && array_key_exists($inputkey, $cta)) {
 				$key = $cta[$inputkey];
-			} elseif(isset($this->config[$inputkey])) {
+			} elseif(array_key_exists($inputkey, $this->config)) {
 				$key = $inputkey;
 			} else {
 				continue;
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index b2075748a3..08ac4ac626 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -78,6 +78,8 @@ class Connection extends LDAPUtility {
 		//a cloned instance inherits the connection resource. It may use it,
 		//but it may not disconnect it
 		$this->dontDestruct = true;
+		$this->configuration = new Configuration($this->configPrefix,
+												 !is_null($this->configID));
 	}
 
 	public function __get($name) {
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index 7de7fe8667..b5955cb2ab 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -120,7 +120,7 @@ class Helper {
 
 		$saveOtherConfigurations = '';
 		if(empty($prefix)) {
-			$saveOtherConfigurations = 'AND `Configkey` NOT LIKE \'s%\'';
+			$saveOtherConfigurations = 'AND `configkey` NOT LIKE \'s%\'';
 		}
 
 		$query = \OCP\DB::prepare('
diff --git a/apps/user_ldap/tests/connection.php b/apps/user_ldap/tests/connection.php
new file mode 100644
index 0000000000..f51b0c8301
--- /dev/null
+++ b/apps/user_ldap/tests/connection.php
@@ -0,0 +1,54 @@
+<?php
+/**
+* ownCloud
+*
+* @author Arthur Schiwon
+* @copyright 2013 Arthur Schiwon blizzz@owncloud.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace OCA\user_ldap\tests;
+
+class Test_Connection extends \PHPUnit_Framework_TestCase {
+
+	public function testOriginalAgentUnchangedOnClone() {
+		//background: upon login a bind is done with the user credentials
+		//which is valid for the whole LDAP resource. It needs to be reset
+		//to the agent's credentials
+		$lw  = $this->getMock('\OCA\user_ldap\lib\ILDAPWrapper');
+
+		$connection = new \OCA\user_ldap\lib\Connection($lw, '', null);
+		$agent = array(
+			'ldapAgentName' => 'agent',
+			'ldapAgentPassword' => '123456',
+		);
+		$connection->setConfiguration($agent);
+
+		$testConnection = clone $connection;
+		$user = array(
+			'ldapAgentName' => 'user',
+			'ldapAgentPassword' => 'password',
+		);
+		$testConnection->setConfiguration($user);
+
+		$agentName = $connection->ldapAgentName;
+		$agentPawd = $connection->ldapAgentPassword;
+
+		$this->assertSame($agentName, $agent['ldapAgentName']);
+		$this->assertSame($agentPawd, $agent['ldapAgentPassword']);
+	}
+
+}
\ No newline at end of file
diff --git a/apps/user_ldap/user_proxy.php b/apps/user_ldap/user_proxy.php
index 5ad127197f..2cb3dfb2c6 100644
--- a/apps/user_ldap/user_proxy.php
+++ b/apps/user_ldap/user_proxy.php
@@ -54,11 +54,15 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 	protected  function walkBackends($uid, $method, $parameters) {
 		$cacheKey = $this->getUserCacheKey($uid);
 		foreach($this->backends as $configPrefix => $backend) {
-// 			print("walkBackend '$configPrefix'<br/>");
-		    if($result = call_user_func_array(array($backend, $method), $parameters)) {
+			$instance = $backend;
+			if(!method_exists($instance, $method)
+				&& method_exists($this->getAccess($configPrefix), $method)) {
+				$instance = $this->getAccess($configPrefix);
+			}
+			if($result = call_user_func_array(array($instance, $method), $parameters)) {
 				$this->writeToCache($cacheKey, $configPrefix);
 				return $result;
-		    }
+			}
 		}
 		return false;
 	}
@@ -77,7 +81,12 @@ class User_Proxy extends lib\Proxy implements \OCP\UserInterface {
 		//in case the uid has been found in the past, try this stored connection first
 		if(!is_null($prefix)) {
 			if(isset($this->backends[$prefix])) {
-				$result = call_user_func_array(array($this->backends[$prefix], $method), $parameters);
+				$instance = $this->backends[$prefix];
+				if(!method_exists($instance, $method)
+					&& method_exists($this->getAccess($prefix), $method)) {
+					$instance = $this->getAccess($prefix);
+				}
+				$result = call_user_func_array(array($instance, $method), $parameters);
 				if($result === $passOnWhen) {
 					//not found here, reset cache to null if user vanished
 					//because sometimes methods return false with a reason
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
index 76b314e48a..20c5909cc1 100755
--- a/apps/user_webdavauth/appinfo/info.xml
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -4,7 +4,7 @@
 	<name>WebDAV user backend</name>
 	<description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other webserver to authenticate. It should return http 200 for right credentials and http 401 for wrong ones.
 
-	This app is not compatible to the LDAP user and group backend.</description>
+	This app is not compatible with the LDAP user and group backend.</description>
 	<licence>AGPL</licence>
 	<author>Frank Karlitschek</author>
 	<require>4.93</require>
diff --git a/apps/user_webdavauth/l10n/id.php b/apps/user_webdavauth/l10n/id.php
index 278055ce8c..50084bf7f2 100644
--- a/apps/user_webdavauth/l10n/id.php
+++ b/apps/user_webdavauth/l10n/id.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
-"WebDAV Authentication" => "Otentikasi WebDAV"
+"WebDAV Authentication" => "Otentikasi WebDAV",
+"Address: " => "Alamat:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan menafsirkan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ja.php b/apps/user_webdavauth/l10n/ja.php
new file mode 100644
index 0000000000..bab7be008e
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ja.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV 認証",
+"Address: " => "アドレス:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ユーザーの権限情報をこのアドレスに送信します。このプラグインは応答をチェックし、HTTP状態コードが 401 と 403 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/km.php b/apps/user_webdavauth/l10n/km.php
new file mode 100644
index 0000000000..74e61861a9
--- /dev/null
+++ b/apps/user_webdavauth/l10n/km.php
@@ -0,0 +1,7 @@
+<?php
+$TRANSLATIONS = array(
+"WebDAV Authentication" => "ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ WebDAV",
+"Address: " => "អាសយដ្ឋាន៖",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "អត្តសញ្ញាណ​អ្នក​ប្រើ​នឹង​ត្រូវ​ផ្ញើ​ទៅ​អាសយដ្ឋាន​នេះ។ កម្មវិធី​បន្ថែម​នេះ​ពិនិត្យ​ចម្លើយ​តប ហើយ​នឹង​បក​ស្រាយ​កូដ​ស្ថានភាព HTTP ដូច​ជា 401 និង 403 ថា​ជា​អត្តសញ្ញាណ​មិន​ត្រឹម​ត្រូវ ហើយ​និង​ចម្លើយ​តប​ផ្សេងៗ​ថា​ត្រឹម​ត្រូវ។"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/nb_NO.php b/apps/user_webdavauth/l10n/nb_NO.php
index e7ee8ae56b..c472270388 100644
--- a/apps/user_webdavauth/l10n/nb_NO.php
+++ b/apps/user_webdavauth/l10n/nb_NO.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
-"Address: " => "Adresse:"
+"WebDAV Authentication" => "WebDAV-autentisering",
+"Address: " => "Adresse:",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Brukerens påloggingsinformasjon vil bli sendt til denne adressen. Denne utvidelsen sjekker svaret og vil tolke HTTP-statuskodene 401 og 403 som ugyldig bruker eller passord, og alle andre svar tolkes som gyldig påloggings."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/vi.php b/apps/user_webdavauth/l10n/vi.php
index 1ab4687922..0ba38cc26f 100644
--- a/apps/user_webdavauth/l10n/vi.php
+++ b/apps/user_webdavauth/l10n/vi.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
-"WebDAV Authentication" => "Xác thực WebDAV"
+"WebDAV Authentication" => "Xác thực WebDAV",
+"Address: " => "Địa chỉ :",
+"The user credentials will be sent to this address. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Các thông tin người dùng sẽ được gửi đến địa chỉ này. Plugin này sẽ kiểm tra các phản hồi và các statuscodes HTTP 401 và 403 không hợp lệ, và tất cả những phản h khác như thông tin hợp lệ."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/build/package.json b/build/package.json
index c9ed7b96c6..0c395839cf 100644
--- a/build/package.json
+++ b/build/package.json
@@ -14,7 +14,9 @@
                 "karma": "*",
                 "karma-jasmine": "*",
                 "karma-junit-reporter": "*",
-	            "karma-coverage": "*"
+	            "karma-coverage": "*",
+                "karma-phantomjs-launcher": "*",
+                "phantomjs": "*"
         },
         "engine": "node >= 0.8"
 }
diff --git a/config/config.sample.php b/config/config.sample.php
index 9c5eca8a5e..140b75706e 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -178,6 +178,12 @@ $CONFIG = array(
 /* Enable or disable the logging of IP addresses in case of webform auth failures */
 "log_authfailip" => false,
 
+/* Whether ownCloud should log the last successfull cron exec */
+"cron_log" => true,
+
+/* Whether http-basic username must equal username to login */
+"basic_auth" => true,
+
 /*
  * Configure the size in bytes log rotation should happen, 0 or false disables the rotation.
  * This rotates the current owncloud logfile to a new name, this way the total log usage
@@ -270,6 +276,15 @@ $CONFIG = array(
 /* all css and js files will be served by the web server statically in one js file and ons css file*/
 'asset-pipeline.enabled' => false,
 
- /* where mount.json file should be stored, defaults to data/mount.json */
- 'mount_file' => '',
+/* where mount.json file should be stored, defaults to data/mount.json */
+'mount_file' => '',
+
+/*
+ * Location of the cache folder, defaults to "data/$user/cache" where "$user" is the current user.
+ *
+ * When specified, the format will change to "$cache_path/$user" where "$cache_path" is the configured
+ * cache directory and "$user" is the user.
+ *
+ */
+'cache_path' => ''
 );
diff --git a/console.php b/console.php
index 25b8b31253..dd2c1026e4 100644
--- a/console.php
+++ b/console.php
@@ -8,7 +8,6 @@
 
 use Symfony\Component\Console\Application;
 
-$RUNTIME_NOAPPS = true;
 require_once 'lib/base.php';
 
 // Don't do anything if ownCloud has not been installed yet
@@ -22,6 +21,9 @@ if (!OC::$CLI) {
 	exit(0);
 }
 
+// load all apps to get all api routes properly setup
+OC_App::loadApps();
+
 $defaults = new OC_Defaults;
 $application = new Application($defaults->getName(), \OC_Util::getVersionString());
 require_once 'core/register_command.php';
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 86ee018e38..e667d9b5fa 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -21,7 +21,6 @@
 
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
-OC_App::loadApps();
 
 $defaults = new \OCP\Defaults();
 
@@ -80,6 +79,14 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			break;
 		case 'setExpirationDate':
 			if (isset($_POST['date'])) {
+				$l = OC_L10N::get('core');
+				$date = new \DateTime($_POST['date']);
+				$today = new \DateTime('now');
+
+				if ($date < $today) {
+					OC_JSON::error(array('data' => array('message' => $l->t('Expiration date is in the past.'))));
+					return;
+				}
 				$return = OCP\Share::setExpirationDate($_POST['itemType'], $_POST['itemSource'], $_POST['date']);
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
@@ -145,10 +152,17 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			}
 
 			$result = $mailNotification->sendLinkShareMail($to_address, $file, $link, $expiration);
-			if($result === true) {
+			if(empty($result)) {
 				\OCP\JSON::success();
 			} else {
-				\OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($result))));
+				$l = OC_L10N::get('core');
+				OCP\JSON::error(array(
+					'data' => array(
+						'message' => $l->t("Couldn't send mail to following users: %s ",
+								implode(', ', $result)
+							)
+					)
+				));
 			}
 
 			break;
diff --git a/core/ajax/update.php b/core/ajax/update.php
index d6af84e95b..55e8ab15ec 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -1,6 +1,5 @@
 <?php
 set_time_limit(0);
-$RUNTIME_NOAPPS = true;
 require_once '../../lib/base.php';
 
 if (OC::checkUpgrade(false)) {
@@ -16,15 +15,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 128d27aa3d..ed72d136e2 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -27,10 +27,13 @@ class Upgrade extends Command {
 		;
 	}
 
+	/**
+	 * Execute the upgrade command
+	 *
+	 * @param InputInterface $input input interface
+	 * @param OutputInterface $output output interface
+	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		global $RUNTIME_NOAPPS;
-
-		$RUNTIME_NOAPPS = true; //no apps, yet
 
 		require_once \OC::$SERVERROOT . '/lib/base.php';
 
@@ -53,15 +56,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);
@@ -69,6 +63,9 @@ class Upgrade extends Command {
 			});
 
 			$updater->upgrade();
+
+			$this->postUpgradeCheck($input, $output);
+
 			return self::ERROR_SUCCESS;
 		} else if(\OC_Config::getValue('maintenance', false)) {
 			//Possible scenario: ownCloud core is updated but an app failed
@@ -84,4 +81,21 @@ class Upgrade extends Command {
 			return self::ERROR_UP_TO_DATE;
 		}
 	}
+
+	/**
+	 * Perform a post upgrade check (specific to the command line tool)
+	 *
+	 * @param InputInterface $input input interface
+	 * @param OutputInterface $output output interface
+	 */
+	protected function postUpgradeCheck(InputInterface $input, OutputInterface $output) {
+		$trustedDomains = \OC_Config::getValue('trusted_domains', array());
+		if (empty($trustedDomains)) {
+			$output->write(
+				'<warning>The setting "trusted_domains" could not be ' .
+				'set automatically by the upgrade script, ' .
+				'please set it manually</warning>'
+			);
+		}
+	}
 }
diff --git a/core/command/user/report.php b/core/command/user/report.php
index 70c5a8566b..a5159310af 100644
--- a/core/command/user/report.php
+++ b/core/command/user/report.php
@@ -46,7 +46,6 @@ class Report extends Command {
 	}
 
 	private function countUsers() {
-		\OC_App::loadApps(array('authentication'));
 		$userManager = \OC::$server->getUserManager();
 		return $userManager->countUsers();
 	}
@@ -56,4 +55,4 @@ class Report extends Command {
 		$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
 		return count($userDirectories);
 	}
-}
\ No newline at end of file
+}
diff --git a/core/css/apps.css b/core/css/apps.css
index f68f53d699..0e6a080c9c 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -187,6 +187,9 @@
 }
 #app-settings.open #app-settings-content {
 	display: block;
+	/* restrict height of settings and make scrollable */
+	max-height: 300px;
+	overflow-y: auto;
 }
 
 .settings-button {
diff --git a/core/css/icons.css b/core/css/icons.css
index 027a3f8557..cdfdd8e43e 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -24,7 +24,7 @@
 
 .icon-noise {
 	background-image: url('../img/noise.png');
-	background-repeat: no-repeat;
+	background-repeat: repeat;
 }
 
 
@@ -156,11 +156,15 @@
 	background-image: url('../img/actions/sound-off.svg');
 }
 
-.icon-star {
+.icon-star,
+.icon-starred:hover,
+.icon-starred:focus {
 	background-image: url('../img/actions/star.svg');
 }
 
-.icon-starred {
+.icon-starred,
+.icon-star:hover,
+.icon-star:focus {
 	background-image: url('../img/actions/starred.svg');
 }
 
diff --git a/core/css/jquery.ocdialog.css b/core/css/jquery.ocdialog.css
index 236968e324..a1221137bc 100644
--- a/core/css/jquery.ocdialog.css
+++ b/core/css/jquery.ocdialog.css
@@ -43,7 +43,7 @@
 	background-color: #000;
 	opacity: .20;filter:Alpha(Opacity=20);
 	z-index: 999;
-	position: absolute;
+	position: fixed;
 	top: 0; left: 0;
 	width: 100%; height: 100%;
 }
diff --git a/core/css/mobile.css b/core/css/mobile.css
index a63aa902d3..c67ac3e5ec 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -1,4 +1,12 @@
-@media only screen and (max-width: 600px) {
+@media only screen and (max-width: 768px) {
+
+/* show caret indicator next to logo to make clear it is tappable */
+#owncloud.menutoggle {
+	background-image: url('../img/actions/caret.svg');
+	background-repeat: no-repeat;
+	background-position: right 26px;
+	padding-right: 16px !important;
+}
 
 /* compress search box on mobile, expand when focused */
 .searchbox input[type="search"] {
@@ -18,5 +26,80 @@
 	display: none;
 }
 
+/* toggle navigation */
+#content-wrapper {
+	padding-left: 0;
+}
+
+#navigation {
+	top: 45px;
+	bottom: initial;
+	width: 255px;
+	max-height: 90%;
+	margin-top: 0;
+	top: 45px;
+	background-color: rgba(36, 40, 47, .97);
+	overflow-x: initial;
+	border-bottom-right-radius: 7px;
+	border-bottom: 1px #333 solid;
+	border-right: 1px #333 solid;
+	box-shadow: 0 0 7px rgba(29,45,68,.97);
+	display: none;
+}
+#navigation, #navigation * {
+	box-sizing:border-box; -moz-box-sizing:border-box;
+}
+#navigation li {
+	display: inline-block;
+}
+#navigation a {
+	width: 80px;
+	height: 80px;
+	display: inline-block;
+	text-align: center;
+	padding: 20px 0;
+}
+#navigation a span {
+	display: inline-block;
+	font-size: 13px;
+	padding-bottom: 0;
+	padding-left: 0;
+	width: 80px;
+}
+#navigation .icon {
+	margin: 0 auto;
+	padding: 0;
+}
+#navigation li:first-child .icon {
+	padding-top: 0;
+}
+/* Apps management as sticky footer */
+#navigation .wrapper {
+	min-height: initial;
+	margin: 0;
+}
+#apps-management, #navigation .push {
+	height: initial;
+}
+
+
+
+/* shift to account for missing navigation */
+#body-user #controls,
+#body-settings #controls {
+	padding-left: 0;
+}
+
+/* don’t require a minimum width for controls bar */
+#controls {
+	min-width: initial !important;
+}
+
+/* position share dropdown */
+#dropdown {
+	margin-right: 10% !important;
+	width: 80% !important;
+}
+
 
 }
diff --git a/core/css/styles.css b/core/css/styles.css
index 082d2c714c..2bc9717f93 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -10,7 +10,7 @@ table { border-collapse:separate; border-spacing:0; white-space:nowrap; }
 caption, th, td { text-align:left; font-weight:normal; }
 table, td, th { vertical-align:middle; }
 a { border:0; color:#000; text-decoration:none;}
-a, a *, input, input *, select, .button span, li, label { cursor:pointer; }
+a, a *, input, input *, select, .button span, label { cursor:pointer; }
 ul { list-style:none; }
 body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Arial,FreeSans,sans-serif; color:#000; }
 
@@ -77,6 +77,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
 
 #header .logo {
 	background-image: url(../img/logo.svg);
+	background-repeat: no-repeat;
 	width: 250px;
 	height: 118px;
 	margin: 0 auto;
@@ -84,6 +85,7 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
 
 #header .logo-wide {
 	background-image: url(../img/logo-wide.svg);
+	background-repeat: no-repeat;
 	width: 147px;
 	height: 32px;
 }
@@ -99,11 +101,18 @@ input[type="time"],
 textarea,
 select,
 button, .button,
+input[type="submit"],
+input[type="button"],
 #quota,
 .pager li a {
-	width:10em; margin:.3em; padding:.6em .5em .4em;
-	font-size:1em;
-	background:#fff; color:#333; border:1px solid #ddd; outline:none;
+	width: 130px;
+	margin: 3px 3px 3px 0;
+	padding: 7px 6px 5px;
+	font-size: 13px;
+	background: #fff;
+	color: #333;
+	border: 1px solid #ddd;
+	outline: none;
 	border-radius: 3px;
 }
 input[type="hidden"] {
@@ -168,13 +177,12 @@ input[type="submit"], input[type="button"],
 button, .button,
 #quota, select, .pager li a {
 	width: auto;
-	padding: .4em;
+	padding: 5px;
 	background-color: rgba(240,240,240,.9);
 	font-weight: bold;
 	color: #555;
 	border: 1px solid rgba(190,190,190,.9);
 	cursor: pointer;
-	border-radius: 3px;
 }
 input[type="submit"]:hover, input[type="submit"]:focus,
 input[type="button"]:hover, input[type="button"]:focus,
@@ -204,18 +212,18 @@ textarea:disabled {
 /* Primary action button, use sparingly */
 .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary {
 	border: 1px solid #1d2d44;
-	background: #35537a;
+	background-color: #35537a;
 	color: #ddd;
 }
 	.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,
 	.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {
 		border: 1px solid #1d2d44;
-		background: #304d76;
+		background-color: #304d76;
 		color: #fff;
 	}
 	.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {
 		border: 1px solid #1d2d44;
-		background: #1d2d44;
+		background-color: #1d2d44;
 		color: #bbb;
 	}
 
@@ -233,7 +241,7 @@ textarea:disabled {
 }
 
 input[type="submit"].enabled {
-	background: #66f866;
+	background-color: #66f866;
 	border: 1px solid #5e5;
 }
 
@@ -245,6 +253,7 @@ input[type="submit"].enabled {
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;
 	position: fixed;
+	top:45px;
 	right: 0;
 	left: 0;
 	height: 44px;
diff --git a/core/img/logo-mail.gif b/core/img/logo-mail.gif
index 6a1caaa918..f1dd108450 100644
Binary files a/core/img/logo-mail.gif and b/core/img/logo-mail.gif differ
diff --git a/core/js/core.json b/core/js/core.json
index 4beab7cf79..665e2485a9 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -17,7 +17,6 @@
 		"eventsource.js",
 		"config.js",
 		"multiselect.js",
-		"router.js",
 		"oc-requesttoken.js"
 	]
 }
diff --git a/core/js/jquery.avatar.js b/core/js/jquery.avatar.js
index 02a40c088b..381c42d9db 100644
--- a/core/js/jquery.avatar.js
+++ b/core/js/jquery.avatar.js
@@ -75,31 +75,32 @@
 
 		var $div = this;
 
-		OC.Router.registerLoadedCallback(function() {
-			var url = OC.Router.generate('core_avatar_get', {user: user, size: size})+'?requesttoken='+oc_requesttoken;
-			$.get(url, function(result) {
-				if (typeof(result) === 'object') {
-					if (!hidedefault) {
-						if (result.data && result.data.displayname) {
-							$div.imageplaceholder(user, result.data.displayname);
-						} else {
-							$div.imageplaceholder(user);
-						}
+		var url = OC.generateUrl(
+			'/avatar/{user}/{size}?requesttoken={requesttoken}',
+			{user: user, size: size, requesttoken: oc_requesttoken});
+
+		$.get(url, function(result) {
+			if (typeof(result) === 'object') {
+				if (!hidedefault) {
+					if (result.data && result.data.displayname) {
+						$div.imageplaceholder(user, result.data.displayname);
 					} else {
-						$div.hide();
+						$div.imageplaceholder(user);
 					}
 				} else {
-					$div.show();
-					if (ie8fix === true) {
-						$div.html('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">');
-					} else {
-						$div.html('<img src="'+url+'">');
-					}
+					$div.hide();
 				}
-				if(typeof callback === 'function') {
-					callback();
+			} else {
+				$div.show();
+				if (ie8fix === true) {
+					$div.html('<img src="'+url+'#'+Math.floor(Math.random()*1000)+'">');
+				} else {
+					$div.html('<img src="'+url+'">');
 				}
-			});
+			}
+			if(typeof callback === 'function') {
+				callback();
+			}
 		});
 	};
 }(jQuery));
diff --git a/core/js/js.js b/core/js/js.js
index 21ccee0f1d..302b6b4d9f 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -27,7 +27,7 @@ if (oc_debug !== true || typeof console === "undefined" || typeof console.log ==
 	if (!window.console) {
 		window.console = {};
 	}
-	var methods = ['log', 'debug', 'warn', 'info', 'error', 'assert'];
+	var methods = ['log', 'debug', 'warn', 'info', 'error', 'assert', 'time', 'timeEnd'];
 	for (var i = 0; i < methods.length; i++) {
 		console[methods[i]] = function () { };
 	}
@@ -194,6 +194,30 @@ var OC={
 	linkToRemoteBase:function(service) {
 		return OC.webroot + '/remote.php/' + service;
 	},
+
+	/**
+	 * Generates the absolute url for the given relative url, which can contain parameters.
+	 *
+	 * @returns {string}
+	 * @param {string} url
+	 * @param params
+	 */
+	generateUrl: function(url, params) {
+		var _build = function (text, vars) {
+			return text.replace(/{([^{}]*)}/g,
+				function (a, b) {
+					var r = vars[b];
+					return typeof r === 'string' || typeof r === 'number' ? r : a;
+				}
+			);
+		};
+		if (url.charAt(0) !== '/') {
+			url = '/' + url;
+
+		}
+		return OC.webroot + '/index.php' + _build(url, params);
+	},
+
 	/**
 	 * @brief Creates an absolute url for remote use
 	 * @param string $service id
@@ -458,6 +482,53 @@ var OC={
 				}).show();
 			}, 'html');
 		}
+	},
+
+	// for menu toggling
+	registerMenu: function($toggle, $menuEl) {
+		$menuEl.addClass('menu');
+		$toggle.addClass('menutoggle');
+		$toggle.on('click.menu', function(event) {
+			if ($menuEl.is(OC._currentMenu)) {
+				$menuEl.hide();
+				OC._currentMenu = null;
+				OC._currentMenuToggle = null;
+				return false;
+			}
+			// another menu was open?
+			else if (OC._currentMenu) {
+				// close it
+				OC._currentMenu.hide();
+			}
+			$menuEl.show();
+			OC._currentMenu = $menuEl;
+			OC._currentMenuToggle = $toggle;
+			return false
+		});
+	},
+
+	unregisterMenu: function($toggle, $menuEl) {
+		// close menu if opened
+		if ($menuEl.is(OC._currentMenu)) {
+			$menuEl.hide();
+			OC._currentMenu = null;
+			OC._currentMenuToggle = null;
+		}
+		$toggle.off('click.menu').removeClass('menutoggle');
+		$menuEl.removeClass('menu');
+	},
+
+	/**
+	 * Wrapper for matchMedia
+	 *
+	 * This is makes it possible for unit tests to
+	 * stub matchMedia (which doesn't work in PhantomJS)
+	 */
+	_matchMedia: function(media) {
+		if (window.matchMedia) {
+			return window.matchMedia(media);
+		}
+		return false;
 	}
 };
 OC.search.customResults={};
@@ -638,6 +709,9 @@ if(typeof localStorage !=='undefined' && localStorage !== null){
 		setItem:function(name,item){
 			return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item));
 		},
+		removeItem:function(name,item){
+			return localStorage.removeItem(OC.localStorage.namespace+name);
+		},
 		getItem:function(name){
 			var item = localStorage.getItem(OC.localStorage.namespace+name);
 			if(item===null) {
@@ -685,11 +759,11 @@ SVGSupport.checkMimeType=function(){
 						if(value[0]==='"'){
 							value=value.substr(1,value.length-2);
 						}
-						headers[parts[0]]=value;
+						headers[parts[0].toLowerCase()]=value;
 					}
 				}
 			});
-			if(headers["Content-Type"]!=='image/svg+xml'){
+			if(headers["content-type"]!=='image/svg+xml'){
 				replaceSVG();
 				SVGSupport.checkMimeType.correct=false;
 			}
@@ -791,12 +865,10 @@ function initCore() {
 		if (interval < 60) {
 			interval = 60;
 		}
-		OC.Router.registerLoadedCallback(function(){
-			var url = OC.Router.generate('heartbeat');
-			setInterval(function(){
-				$.post(url);
-			}, interval * 1000);
-		});
+		var url = OC.generateUrl('/heartbeat');
+		setInterval(function(){
+			$.post(url);
+		}, interval * 1000);
 	}
 
 	// session heartbeat (defaults to enabled)
@@ -915,6 +987,67 @@ function initCore() {
 	$('a.action').tipsy({gravity:'s', fade:true, live:true});
 	$('td .modified').tipsy({gravity:'s', fade:true, live:true});
 	$('input').tipsy({gravity:'w', fade:true});
+
+	// toggle for menus
+	$(document).on('mouseup.closemenus', function(event) {
+		var $el = $(event.target);
+		if ($el.closest('.menu').length || $el.closest('.menutoggle').length) {
+			// don't close when clicking on the menu directly or a menu toggle
+			return false;
+		}
+		if (OC._currentMenu) {
+			OC._currentMenu.hide();
+		}
+		OC._currentMenu = null;
+		OC._currentMenuToggle = null;
+	});
+
+
+	/**
+	 * Set up the main menu toggle to react to media query changes.
+	 * If the screen is small enough, the main menu becomes a toggle.
+	 * If the screen is bigger, the main menu is not a toggle any more.
+	 */
+	function setupMainMenu() {
+		// toggle the navigation on mobile
+		if (!OC._matchMedia) {
+			return;
+		}
+		var mq = OC._matchMedia('(max-width: 768px)');
+		var lastMatch = mq.matches;
+		var $toggle = $('#header #owncloud');
+		var $navigation = $('#navigation');
+
+		function updateMainMenu() {
+			// mobile mode ?
+			if (lastMatch && !$toggle.hasClass('menutoggle')) {
+				// init the menu
+				OC.registerMenu($toggle, $navigation);
+				$toggle.data('oldhref', $toggle.attr('href'));
+				$toggle.attr('href', '#');
+				$navigation.hide();
+			}
+			else {
+				OC.unregisterMenu($toggle, $navigation);
+				$toggle.attr('href', $toggle.data('oldhref'));
+				$navigation.show();
+			}
+		}
+
+		updateMainMenu();
+
+		// TODO: debounce this
+		$(window).resize(function() {
+			if (lastMatch !== mq.matches) {
+				lastMatch = mq.matches;
+				updateMainMenu();
+			}
+		});
+	}
+
+	if (window.matchMedia) {
+		setupMainMenu();
+	}
 }
 
 $(document).ready(initCore);
diff --git a/core/js/router.js b/core/js/router.js
deleted file mode 100644
index e6ef54a186..0000000000
--- a/core/js/router.js
+++ /dev/null
@@ -1,81 +0,0 @@
-OC.router_base_url = OC.webroot + '/index.php';
-OC.Router = {
-	// register your ajax requests to load after the loading of the routes
-	// has finished. otherwise you face problems with race conditions
-	registerLoadedCallback: function(callback){
-		if (!this.routes_request){
-			return;
-		}
-		this.routes_request.done(callback);
-	},
-	routes_request: !window.TESTING && $.ajax(OC.router_base_url + '/core/routes.json', {
-		dataType: 'json',
-		success: function(jsondata) {
-			if (jsondata.status === 'success') {
-				OC.Router.routes = jsondata.data;
-			}
-		}
-	}),
-	generate:function(name, opt_params) {
-		if (!('routes' in this)) {
-			if(this.routes_request.state() != 'resolved') {
-				console.warn('To avoid race conditions, please register a callback');// wait
-			}
-		}
-		if (!(name in this.routes)) {
-			throw new Error('The route "' + name + '" does not exist.');
-		}
-		var route = this.routes[name];
-		var params = opt_params || {};
-		var unusedParams = $.extend(true, {}, params);
-		var url = '';
-		var optional = true;
-		$(route.tokens).each(function(i, token) {
-			if ('text' === token[0]) {
-			    url = token[1] + url;
-			    optional = false;
-
-			    return;
-			}
-
-			if ('variable' === token[0]) {
-			    if (false === optional || !(token[3] in route.defaults)
-				    || ((token[3] in params) && params[token[3]] != route.defaults[token[3]])) {
-				var value;
-				if (token[3] in params) {
-				    value = params[token[3]];
-				    delete unusedParams[token[3]];
-				} else if (token[3] in route.defaults) {
-				    value = route.defaults[token[3]];
-				} else if (optional) {
-				    return;
-				} else {
-				    throw new Error('The route "' + name + '" requires the parameter "' + token[3] + '".');
-				}
-
-				var empty = true === value || false === value || '' === value;
-
-				if (!empty || !optional) {
-				    url = token[1] + encodeURIComponent(value).replace(/%2F/g, '/') + url;
-				}
-
-				optional = false;
-			    }
-
-			    return;
-			}
-
-			throw new Error('The token type "' + token[0] + '" is not supported.');
-		});
-		if (url === '') {
-			url = '/';
-		}
-
-		unusedParams = $.param(unusedParams);
-		if (unusedParams.length > 0) {
-			url += '?'+unusedParams;
-		}
-
-		return OC.router_base_url + url;
-	}
-}
diff --git a/core/js/setup.js b/core/js/setup.js
index 279b5fbebb..96719540f9 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -36,6 +36,7 @@ $(document).ready(function() {
 
 	$('#showAdvanced').click(function() {
 		$('#datadirContent').slideToggle(250);
+		$('#databaseBackend').slideToggle(250);
 		$('#databaseField').slideToggle(250);
 	});
 	$("form").submit(function(){
@@ -73,6 +74,7 @@ $(document).ready(function() {
 
 	if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
 		$('#datadirContent').hide(250);
+		$('#databaseBackend').hide(250);
 		$('#databaseField').hide(250);
 	}
 
diff --git a/core/js/share.js b/core/js/share.js
index 0939259b7d..e769edd0a2 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -48,7 +48,7 @@ OC.Share={
 					var action = $(file).find('.fileactions .action[data-action="Share"]');
 					var img = action.find('img').attr('src', image);
 					action.addClass('permanent');
-					action.html(' '+t('core', 'Shared')).prepend(img);
+					action.html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
 				} else {
 					var dir = $('#dir').val();
 					if (dir.length > 1) {
@@ -63,7 +63,7 @@ OC.Share={
 									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
 										$(action).addClass('permanent');
-										$(action).html(' '+t('core', 'Shared')).prepend(img);
+										$(action).html(' <span>'+t('core', 'Shared')+'</span>').prepend(img);
 									}
 								});
 							}
@@ -103,10 +103,10 @@ OC.Share={
 				var img = action.find('img').attr('src', image);
 				if (shares) {
 					action.addClass('permanent');
-					action.html(' '+ escapeHTML(t('core', 'Shared'))).prepend(img);
+					action.html(' <span>'+ escapeHTML(t('core', 'Shared'))+'</span>').prepend(img);
 				} else {
 					action.removeClass('permanent');
-					action.html(' '+ escapeHTML(t('core', 'Share'))).prepend(img);
+					action.html(' <span>'+ escapeHTML(t('core', 'Share'))+'</span>').prepend(img);
 				}
 			}
 		}
@@ -584,8 +584,8 @@ $(document).ready(function() {
 				$(checkboxes).filter('input[name="edit"]').attr('checked', false);
 			// Check Edit if Create, Update, or Delete is checked
 			} else if (($(this).attr('name') == 'create'
-					 || $(this).attr('name') == 'update'
-					 || $(this).attr('name') == 'delete'))
+				|| $(this).attr('name') == 'update'
+				|| $(this).attr('name') == 'delete'))
 			{
 				$(checkboxes).filter('input[name="edit"]').attr('checked', true);
 			}
@@ -718,9 +718,21 @@ $(document).ready(function() {
 	$(document).on('change', '#dropdown #expirationDate', function() {
 		var itemType = $('#dropdown').data('item-type');
 		var itemSource = $('#dropdown').data('item-source');
+
+		$(this).tipsy('hide');
+		$(this).removeClass('error');
+
 		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
 			if (!result || result.status !== 'success') {
-				OC.dialogs.alert(t('core', 'Error setting expiration date'), t('core', 'Error'));
+				var expirationDateField = $('#dropdown #expirationDate');
+				if (!result.data.message) {
+					expirationDateField.attr('original-title', t('core', 'Error setting expiration date'));
+				} else {
+					expirationDateField.attr('original-title', result.data.message);
+				}
+				expirationDateField.tipsy({gravity: 'n', fade: true});
+				expirationDateField.tipsy('show');
+				expirationDateField.addClass('error');
 			}
 		});
 	});
diff --git a/core/js/tags.js b/core/js/tags.js
index bc6d7b4e07..bc2b42bf5f 100644
--- a/core/js/tags.js
+++ b/core/js/tags.js
@@ -69,7 +69,7 @@ OC.Tags= {
 		type = type ? type : this.type;
 		var defer = $.Deferred(),
 			self = this,
-			url = OC.Router.generate('core_tags_ids_for_tag', {type: type});
+			url = OC.generateUrl('/tags/{type}/ids', {type: type});
 		$.getJSON(url, {tag: tag}, function(response) {
 			if(response.status === 'success') {
 				defer.resolve(response.ids);
@@ -90,7 +90,7 @@ OC.Tags= {
 		type = type ? type : this.type;
 		var defer = $.Deferred(),
 			self = this,
-			url = OC.Router.generate('core_tags_favorites', {type: type});
+			url = OC.generateUrl('/tags/{type}/favorites', {type: type});
 		$.getJSON(url, function(response) {
 			if(response.status === 'success') {
 				defer.resolve(response.ids);
@@ -111,7 +111,7 @@ OC.Tags= {
 		type = type ? type : this.type;
 		var defer = $.Deferred(),
 			self = this,
-			url = OC.Router.generate('core_tags_tags', {type: type});
+			url = OC.generateUrl('/tags/{type}', {type: type});
 		$.getJSON(url, function(response) {
 			if(response.status === 'success') {
 				defer.resolve(response.tags);
@@ -133,7 +133,7 @@ OC.Tags= {
 		type = type ? type : this.type;
 		var defer = $.Deferred(),
 			self = this,
-			url = OC.Router.generate('core_tags_tag', {type: type, id: id});
+			url = OC.generateUrl('/tags/{type}/tag/{id}/', {type: type, id: id});
 		$.post(url, {tag: tag}, function(response) {
 			if(response.status === 'success') {
 				defer.resolve(response);
@@ -157,7 +157,7 @@ OC.Tags= {
 		type = type ? type : this.type;
 		var defer = $.Deferred(),
 			self = this,
-			url = OC.Router.generate('core_tags_untag', {type: type, id: id});
+			url = OC.generateUrl('/tags/{type}/untag/{id}/', {type: type, id: id});
 		$.post(url, {tag: tag}, function(response) {
 			if(response.status === 'success') {
 				defer.resolve(response);
@@ -181,7 +181,7 @@ OC.Tags= {
 		type = type ? type : this.type;
 		var defer = $.Deferred(),
 			self = this,
-			url = OC.Router.generate('core_tags_favorite', {type: type, id: id});
+			url = OC.generateUrl('/tags/{type}/favorite/{id}/', {type: type, id: id});
 		$.post(url, function(response) {
 			if(response.status === 'success') {
 				defer.resolve(response);
@@ -205,7 +205,7 @@ OC.Tags= {
 		type = type ? type : this.type;
 		var defer = $.Deferred(),
 			self = this,
-			url = OC.Router.generate('core_tags_unfavorite', {type: type, id: id});
+			url = OC.generateUrl('/tags/{type}/unfavorite/{id}/', {type: type, id: id});
 		$.post(url, function(response) {
 			if(response.status === 'success') {
 				defer.resolve();
@@ -229,7 +229,7 @@ OC.Tags= {
 		type = type ? type : this.type;
 		var defer = $.Deferred(),
 			self = this,
-			url = OC.Router.generate('core_tags_add', {type: type});
+			url = OC.generateUrl('/tags/{type}/add', {type: type});
 		$.post(url,{tag:tag}, function(response) {
 			if(typeof cb == 'function') {
 				cb(response);
@@ -256,7 +256,7 @@ OC.Tags= {
 		type = type ? type : this.type;
 		var defer = $.Deferred(),
 			self = this,
-			url = OC.Router.generate('core_tags_delete', {type: type});
+			url = OC.generateUrl('/tags/{type}/delete', {type: type});
 		if(!tags || !tags.length) {
 			throw new Error(t('core', 'No tags selected for deletion.'));
 		}
diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js
index b119324058..d86cd81cda 100644
--- a/core/js/tests/specHelper.js
+++ b/core/js/tests/specHelper.js
@@ -68,9 +68,14 @@ window.oc_defaults = {};
 // global setup for all tests
 (function setupTests() {
 	var fakeServer = null,
+		$testArea = null,
 		routesRequestStub;
 
 	beforeEach(function() {
+		// test area for elements that need absolute selector access or measure widths/heights
+		// which wouldn't work for detached or hidden elements
+		$testArea = $('<div id="testArea" style="position: absolute; width: 1280px; height: 800px; top: -3000px; left: -3000px;"></div>');
+		$('body').append($testArea);
 		// enforce fake XHR, tests should not depend on the server and
 		// must use fake responses for expected calls
 		fakeServer = sinon.fakeServer.create();
@@ -86,21 +91,14 @@ window.oc_defaults = {};
 		// make it globally available, so that other tests can define
 		// custom responses
 		window.fakeServer = fakeServer;
-
-		OC.Router.routes = [];
-		OC.Router.routes_request = {
-			state: sinon.stub().returns('resolved'),
-			done: sinon.stub()
-		};
 	});
 
 	afterEach(function() {
-		OC.Router.routes_request.state.reset();
-		OC.Router.routes_request.done.reset();
-
 		// uncomment this to log requests
 		// console.log(window.fakeServer.requests);
 		fakeServer.restore();
+
+		$testArea.remove();
 	});
 })();
 
diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js
index 478505e928..57ea5be8be 100644
--- a/core/js/tests/specs/coreSpec.js
+++ b/core/js/tests/specs/coreSpec.js
@@ -179,7 +179,7 @@ describe('Core base tests', function() {
 		});
 		it('Encodes special characters', function() {
 			expect(OC.buildQueryString({
-				unicode: '汉字',
+				unicode: '汉字'
 			})).toEqual('unicode=%E6%B1%89%E5%AD%97');
 			expect(OC.buildQueryString({
 			   	b: 'spaace value',
@@ -199,22 +199,20 @@ describe('Core base tests', function() {
 				'booleantrue': true
 			})).toEqual('booleanfalse=false&booleantrue=true');
 			expect(OC.buildQueryString({
-			   	'number': 123,
+			   	'number': 123
 			})).toEqual('number=123');
 		});
 	});
 	describe('Session heartbeat', function() {
 		var clock,
 			oldConfig,
-			loadedStub,
 			routeStub,
 			counter;
 
 		beforeEach(function() {
 			clock = sinon.useFakeTimers();
 			oldConfig = window.oc_config;
-			loadedStub = sinon.stub(OC.Router, 'registerLoadedCallback');
-			routeStub = sinon.stub(OC.Router, 'generate').returns('/heartbeat');
+			routeStub = sinon.stub(OC, 'generateUrl').returns('/heartbeat');
 			counter = 0;
 
 			fakeServer.autoRespond = true;
@@ -227,7 +225,6 @@ describe('Core base tests', function() {
 		afterEach(function() {
 			clock.restore();
 			window.oc_config = oldConfig;
-			loadedStub.restore();
 			routeStub.restore();
 		});
 		it('sends heartbeat half the session lifetime when heartbeat enabled', function() {
@@ -236,9 +233,7 @@ describe('Core base tests', function() {
 				session_lifetime: 300
 			};
 			window.initCore();
-			expect(loadedStub.calledOnce).toEqual(true);
-			loadedStub.yield();
-			expect(routeStub.calledWith('heartbeat')).toEqual(true);
+			expect(routeStub.calledWith('/heartbeat')).toEqual(true);
 
 			expect(counter).toEqual(0);
 
@@ -264,7 +259,6 @@ describe('Core base tests', function() {
 				session_lifetime: 300
 			};
 			window.initCore();
-			expect(loadedStub.notCalled).toEqual(true);
 			expect(routeStub.notCalled).toEqual(true);
 
 			expect(counter).toEqual(0);
@@ -276,5 +270,118 @@ describe('Core base tests', function() {
 		});
 
 	});
+	describe('Generate Url', function() {
+		it('returns absolute urls', function() {
+			expect(OC.generateUrl('heartbeat')).toEqual(OC.webroot + '/index.php/heartbeat');
+			expect(OC.generateUrl('/heartbeat')).toEqual(OC.webroot + '/index.php/heartbeat');
+		});
+		it('substitutes parameters', function() {
+			expect(OC.generateUrl('apps/files/download{file}', {file: '/Welcome.txt'})).toEqual(OC.webroot + '/index.php/apps/files/download/Welcome.txt');
+		});
+	});
+	describe('Main menu mobile toggle', function() {
+		var oldMatchMedia;
+		var $toggle;
+		var $navigation;
+
+		beforeEach(function() {
+			oldMatchMedia = OC._matchMedia;
+			// a separate method was needed because window.matchMedia
+			// cannot be stubbed due to a bug in PhantomJS:
+			// https://github.com/ariya/phantomjs/issues/12069
+			OC._matchMedia = sinon.stub();
+			$('#testArea').append('<div id="header">' +
+				'<a id="owncloud" href="#"></a>' +
+				'</div>' +
+				'<div id="navigation"></div>');
+			$toggle = $('#owncloud');
+			$navigation = $('#navigation');
+		});
+
+		afterEach(function() {
+			OC._matchMedia = oldMatchMedia;
+		});
+		it('Sets up menu toggle in mobile mode', function() {
+			OC._matchMedia.returns({matches: true});
+			window.initCore();
+			expect($toggle.hasClass('menutoggle')).toEqual(true);
+			expect($navigation.hasClass('menu')).toEqual(true);
+		});
+		it('Does not set up menu toggle in desktop mode', function() {
+			OC._matchMedia.returns({matches: false});
+			window.initCore();
+			expect($toggle.hasClass('menutoggle')).toEqual(false);
+			expect($navigation.hasClass('menu')).toEqual(false);
+		});
+		it('Switches on menu toggle when mobile mode changes', function() {
+			var mq = {matches: false};
+			OC._matchMedia.returns(mq);
+			window.initCore();
+			expect($toggle.hasClass('menutoggle')).toEqual(false);
+			mq.matches = true;
+			$(window).trigger('resize');
+			expect($toggle.hasClass('menutoggle')).toEqual(true);
+		});
+		it('Switches off menu toggle when mobile mode changes', function() {
+			var mq = {matches: true};
+			OC._matchMedia.returns(mq);
+			window.initCore();
+			expect($toggle.hasClass('menutoggle')).toEqual(true);
+			mq.matches = false;
+			$(window).trigger('resize');
+			expect($toggle.hasClass('menutoggle')).toEqual(false);
+		});
+		it('Clicking menu toggle toggles navigation in mobile mode', function() {
+			OC._matchMedia.returns({matches: true});
+			window.initCore();
+			$navigation.hide(); // normally done through media query triggered CSS
+			expect($navigation.is(':visible')).toEqual(false);
+			$toggle.click();
+			expect($navigation.is(':visible')).toEqual(true);
+			$toggle.click();
+			expect($navigation.is(':visible')).toEqual(false);
+		});
+		it('Clicking menu toggle does not toggle navigation in desktop mode', function() {
+			OC._matchMedia.returns({matches: false});
+			window.initCore();
+			expect($navigation.is(':visible')).toEqual(true);
+			$toggle.click();
+			expect($navigation.is(':visible')).toEqual(true);
+		});
+		it('Switching to mobile mode hides navigation', function() {
+			var mq = {matches: false};
+			OC._matchMedia.returns(mq);
+			window.initCore();
+			expect($navigation.is(':visible')).toEqual(true);
+			mq.matches = true;
+			$(window).trigger('resize');
+			expect($navigation.is(':visible')).toEqual(false);
+		});
+		it('Switching to desktop mode shows navigation', function() {
+			var mq = {matches: true};
+			OC._matchMedia.returns(mq);
+			window.initCore();
+			expect($navigation.is(':visible')).toEqual(false);
+			mq.matches = false;
+			$(window).trigger('resize');
+			expect($navigation.is(':visible')).toEqual(true);
+		});
+		it('Switch to desktop with opened menu then back to mobile resets toggle', function() {
+			var mq = {matches: true};
+			OC._matchMedia.returns(mq);
+			window.initCore();
+			expect($navigation.is(':visible')).toEqual(false);
+			$toggle.click();
+			expect($navigation.is(':visible')).toEqual(true);
+			mq.matches = false;
+			$(window).trigger('resize');
+			expect($navigation.is(':visible')).toEqual(true);
+			mq.matches = true;
+			$(window).trigger('resize');
+			expect($navigation.is(':visible')).toEqual(false);
+			$toggle.click();
+			expect($navigation.is(':visible')).toEqual(true);
+		});
+	});
 });
 
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
index e0a564a509..94df818420 100644
--- a/core/l10n/af_ZA.php
+++ b/core/l10n/af_ZA.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Help" => "Hulp",
 "Cloud not found" => "Wolk nie gevind",
 "Create an <strong>admin account</strong>" => "Skep `n <strong>admin-rekening</strong>",
-"Advanced" => "Gevorderd",
 "Configure the database" => "Stel databasis op",
 "will be used" => "sal gebruik word",
 "Database user" => "Databasis-gebruiker",
diff --git a/core/l10n/am_ET.php b/core/l10n/am_ET.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/am_ET.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index b3c43a96cb..8c1d5ec307 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"Sunday" => "الاحد",
+"Unknown filetype" => "نوع الملف غير معروف",
+"Invalid image" => "الصورة غير صالحة",
+"Sunday" => "الأحد",
 "Monday" => "الأثنين",
 "Tuesday" => "الثلاثاء",
 "Wednesday" => "الاربعاء",
@@ -20,6 +22,7 @@ $TRANSLATIONS = array(
 "November" => "تشرين الثاني",
 "December" => "كانون الاول",
 "Settings" => "إعدادات",
+"Saving..." => "جاري الحفظ...",
 "seconds ago" => "منذ ثواني",
 "_%n minute ago_::_%n minutes ago_" => array("","","","","",""),
 "_%n hour ago_::_%n hours ago_" => array("","","","","",""),
@@ -37,6 +40,10 @@ $TRANSLATIONS = array(
 "Ok" => "موافق",
 "_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""),
 "Cancel" => "الغاء",
+"Very weak password" => "كلمة السر ضعيفة جدا",
+"Weak password" => "كلمة السر ضعيفة",
+"Good password" => "كلمة السر جيدة",
+"Strong password" => "كلمة السر قوية",
 "Shared" => "مشارك",
 "Share" => "شارك",
 "Error" => "خطأ",
@@ -45,6 +52,7 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
 "Shared with you and the group {group} by {owner}" => "شورك معك ومع المجموعة {group} من قبل {owner}",
 "Shared with you by {owner}" => "شورك معك من قبل {owner}",
+"Share link" => "شارك الرابط",
 "Password protect" => "حماية كلمة السر",
 "Password" => "كلمة المرور",
 "Email link to person" => "ارسل الرابط بالبريد الى صديق",
@@ -74,11 +82,13 @@ $TRANSLATIONS = array(
 "Add" => "اضف",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "حصل خطأ في عملية التحديث, يرجى ارسال تقرير بهذه المشكلة الى <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
+"%s password reset" => "تمت إعادة ضبط كلمة مرور %s",
 "Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "وصلة تحديث كلمة المرور بعثت الى بريدك الالكتروني.<br> اذا لم تستقبل البريد خلال فترة زمنية قصيره, ابحث في سلة مهملات بريدك.",
 "Request failed!<br>Did you make sure your email/username was right?" => "الطلب رفض! <br> هل انت متأكد أن الاسم/العنوان البريدي صحيح؟",
 "You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
 "Username" => "إسم المستخدم",
+"Yes, I really want to reset my password now" => "نعم، أريد إعادة ضبظ كلمة مروري",
 "Your password was reset" => "لقد تم تعديل كلمة السر",
 "To login page" => "الى صفحة الدخول",
 "New password" => "كلمات سر جديدة",
@@ -92,11 +102,12 @@ $TRANSLATIONS = array(
 "Cloud not found" => "لم يتم إيجاد",
 "Security Warning" => "تحذير أمان",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "يرجى تحديث نسخة PHP لاستخدام %s بطريقة آمنة",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "لا يوجد مولّد أرقام عشوائية ، الرجاء تفعيل الـ PHP OpenSSL extension.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "بدون وجود مولد أرقام عشوائية آمن قد يتمكن المهاجم من التنبؤ بكلمات اعادة ضبط كلمة المرور والتمكن من السيطرة على حسابك",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
 "Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
-"Advanced" => "تعديلات متقدمه",
 "Data folder" => "مجلد المعلومات",
 "Configure the database" => "أسس قاعدة البيانات",
 "will be used" => "سيتم استخدمه",
diff --git a/core/l10n/az.php b/core/l10n/az.php
index dbedde7e63..ffcdde48d4 100644
--- a/core/l10n/az.php
+++ b/core/l10n/az.php
@@ -1,9 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"_%n day ago_::_%n days ago_" => array(""),
-"_%n month ago_::_%n months ago_" => array(""),
-"_{count} file conflict_::_{count} file conflicts_" => array("")
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
 );
-$PLURAL_FORMS = "nplurals=1; plural=0;";
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/be.php b/core/l10n/be.php
index 19d330a44d..56f08cccc3 100644
--- a/core/l10n/be.php
+++ b/core/l10n/be.php
@@ -38,7 +38,6 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
 "Error" => "Памылка",
 "The object type is not specified." => "Тып аб'екта не ўдакладняецца.",
-"Advanced" => "Дасведчаны",
 "Finish setup" => "Завяршыць ўстаноўку."
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index dbed3e2063..397440bea2 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "Ноември",
 "December" => "Декември",
 "Settings" => "Настройки",
+"Saving..." => "Записване...",
 "seconds ago" => "преди секунди",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
@@ -28,18 +29,48 @@ $TRANSLATIONS = array(
 "_%n day ago_::_%n days ago_" => array("",""),
 "last month" => "последният месец",
 "_%n month ago_::_%n months ago_" => array("",""),
+"months ago" => "Преди месеци",
 "last year" => "последната година",
 "years ago" => "последните години",
+"Choose" => "Избери",
 "Yes" => "Да",
 "No" => "Не",
 "Ok" => "Добре",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "Отказ",
+"Shared" => "Споделено",
 "Share" => "Споделяне",
 "Error" => "Грешка",
+"Error while sharing" => "Грешка при споделяне",
+"Error while unsharing" => "Грепка докато се премахва споделянето",
+"Error while changing permissions" => "Грешка при промяна на достъпност",
+"Shared with you and the group {group} by {owner}" => "Споделено с тебе и група {group} от {owner}",
+"Shared with you by {owner}" => "Споделено с тебе от {owner}",
+"Password protect" => "Защитено с парола",
 "Password" => "Парола",
+"Email link to person" => "Изпрати връзка до пощата на някои",
+"Send" => "Изпрати",
+"Set expiration date" => "Посочи дата на изтичане",
+"Expiration date" => "Дата на изтичане",
+"Share via email:" => "сподели по поща:",
+"No people found" => "Не са открити хора",
+"group" => "група",
+"Resharing is not allowed" => "Допълнително споделяне не е разрешено",
+"Shared in {item} with {user}" => "Споделено в {item} с {user}",
+"Unshare" => "Премахни споделяне",
+"can edit" => "може да променя",
+"access control" => "контрол на достъпа",
 "create" => "създаване",
+"update" => "Обновяване",
+"delete" => "Изтриване",
+"share" => "Споделяне",
+"Password protected" => "Защитено с парола",
+"Error unsetting expiration date" => "Грешка при премахване на дата за изтичане",
+"Error setting expiration date" => "Грепка при поставяне на дата за изтичане",
+"Sending ..." => "Изпращам ...",
+"Email sent" => "Пощата е изпратена",
 "Warning" => "Внимание",
+"The object type is not specified." => "Видът на обекта не е избран",
 "Delete" => "Изтриване",
 "Add" => "Добавяне",
 "You will receive a link to reset your password via Email." => "Ще получите връзка за нулиране на паролата Ви.",
@@ -55,7 +86,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Достъпът е забранен",
 "Cloud not found" => "облакът не намерен",
 "Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>",
-"Advanced" => "Разширено",
 "Data folder" => "Директория за данни",
 "Configure the database" => "Конфигуриране на базата",
 "will be used" => "ще се ползва",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index d9de954152..7c74a9d8af 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "নভেম্বর",
 "December" => "ডিসেম্বর",
 "Settings" => "নিয়ামকসমূহ",
+"Saving..." => "সংরক্ষণ করা হচ্ছে..",
 "seconds ago" => "সেকেন্ড পূর্বে",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
@@ -87,7 +88,6 @@ $TRANSLATIONS = array(
 "Cloud not found" => "ক্লাউড খুঁজে পাওয়া গেল না",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
 "Create an <strong>admin account</strong>" => "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
-"Advanced" => "সুচারু",
 "Data folder" => "ডাটা ফোল্ডার ",
 "Configure the database" => "ডাটাবেচ কনফিগার করুন",
 "will be used" => "ব্যবহৃত হবে",
diff --git a/core/l10n/bs.php b/core/l10n/bs.php
index ee8196e974..4a94a23a61 100644
--- a/core/l10n/bs.php
+++ b/core/l10n/bs.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Saving..." => "Spašavam...",
 "_%n minute ago_::_%n minutes ago_" => array("","",""),
 "_%n hour ago_::_%n hours ago_" => array("","",""),
 "_%n day ago_::_%n days ago_" => array("","",""),
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index d8076172ce..0a658d515d 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s ha compartit »%s« amb tu",
+"Expiration date is in the past." => "La data de venciment és en el passat.",
 "Couldn't send mail to following users: %s " => "No s'ha pogut enviar correu als usuaris següents: %s",
 "Turned on maintenance mode" => "Activat el mode de manteniment",
 "Turned off maintenance mode" => "Desactivat el mode de manteniment",
 "Updated database" => "Actualitzada la base de dades",
-"Updating filecache, this may take really long..." => "Actualitzant la memòria de cau del fitxers, això pot trigar molt...",
-"Updated filecache" => "Actualitzada la memòria de cau dels fitxers",
-"... %d%% done ..." => "... %d%% fet ...",
 "No image or file provided" => "No s'han proporcionat imatges o fitxers",
 "Unknown filetype" => "Tipus de fitxer desconegut",
 "Invalid image" => "Imatge no vàlida",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "Novembre",
 "December" => "Desembre",
 "Settings" => "Configuració",
+"Saving..." => "Desant...",
 "seconds ago" => "segons enrere",
 "_%n minute ago_::_%n minutes ago_" => array("fa %n minut","fa %n minuts"),
 "_%n hour ago_::_%n hours ago_" => array("fa %n hora","fa %n hores"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(selecciona-ho tot)",
 "({count} selected)" => "({count} seleccionats)",
 "Error loading file exists template" => "Error en carregar la plantilla de fitxer existent",
+"Very weak password" => "Contrasenya massa feble",
+"Weak password" => "Contrasenya feble",
+"So-so password" => "Contrasenya passable",
+"Good password" => "Contrasenya bona",
+"Strong password" => "Contrasenya forta",
 "Shared" => "Compartit",
 "Share" => "Comparteix",
 "Error" => "Error",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "L'actualització ha estat correcte. Ara us redirigim a ownCloud.",
 "%s password reset" => "restableix la contrasenya %s",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Hi ha hagut un problema enviant el correu, parleu amb el vostre administrador.",
 "Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "L'enllaç per reiniciar la vostra contrasenya s'ha enviat al vostre correu.<br>Si no el rebeu en un temps raonable comproveu les carpetes de spam. <br>Si no és allà, pregunteu a l'administrador local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és correcte?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "A la pàgina d'inici de sessió",
 "New password" => "Contrasenya nova",
 "Reset password" => "Reinicialitza la contrasenya",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
+"For the best results, please consider using a GNU/Linux server instead." => "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
 "Personal" => "Personal",
 "Users" => "Usuaris",
 "Apps" => "Aplicacions",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
-"Advanced" => "Avançat",
+"Storage & database" => "Emmagatzematge i base de dades",
 "Data folder" => "Carpeta de dades",
 "Configure the database" => "Configura la base de dades",
 "will be used" => "s'usarà",
@@ -157,8 +163,8 @@ $TRANSLATIONS = array(
 "This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Aquesta aplicació necessita tenir JavaScript activat per funcionar correctament. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeu JavaScript</a> i carregueu aquesta interfície de nou.",
 "%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.",
 "Log out" => "Surt",
-"Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!",
-"If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
+"Automatic logon rejected!" => "Inici de sessió automàtic rebutjat!",
+"If you did not change your password recently, your account may be compromised!" => "Si no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
 "Please change your password to secure your account again." => "Canvieu la contrasenya de nou per assegurar el vostre compte.",
 "Server side authentication failed!" => "L'autenticació del servidor ha fallat!",
 "Please contact your administrator." => "Contacteu amb l'administrador.",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "recorda'm",
 "Log in" => "Inici de sessió",
 "Alternative Logins" => "Acreditacions alternatives",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ei,<br><br>només fer-te saber que %s ha compartit »%s« amb tu.<br><a href=\"%s\">Mira-ho!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ei, <br><br>només fer-vos saber que %s us ha comparti <strong>%s</strong>. <br><a href=\"%s\">Mireu-ho!</a>",
 "This ownCloud instance is currently in single user mode." => "La instància ownCloud està en mode d'usuari únic.",
 "This means only administrators can use the instance." => "Això significa que només els administradors poden usar la instància.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 38825aaeea..ffe34f7828 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s s vámi sdílí »%s«",
+"Expiration date is in the past." => "Datum expirace je v minulosti.",
 "Couldn't send mail to following users: %s " => "Nebylo možné odeslat e-mail následujícím uživatelům: %s",
 "Turned on maintenance mode" => "Zapnut režim údržby",
 "Turned off maintenance mode" => "Vypnut režim údržby",
 "Updated database" => "Zaktualizována databáze",
-"Updating filecache, this may take really long..." => "Aktualizuji souborovou mezipaměť, toto může trvat opravdu dlouho...",
-"Updated filecache" => "Aktualizována souborová mezipaměť",
-"... %d%% done ..." => "... %d%% dokončeno ...",
 "No image or file provided" => "Soubor nebo obrázek nebyl zadán",
 "Unknown filetype" => "Neznámý typ souboru",
 "Invalid image" => "Chybný obrázek",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "Listopad",
 "December" => "Prosinec",
 "Settings" => "Nastavení",
+"Saving..." => "Ukládám...",
 "seconds ago" => "před pár vteřinami",
 "_%n minute ago_::_%n minutes ago_" => array("před %n minutou","před %n minutami","před %n minutami"),
 "_%n hour ago_::_%n hours ago_" => array("před %n hodinou","před %n hodinami","před %n hodinami"),
@@ -59,6 +57,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",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla úspěšná. Přesměrovávám na ownCloud.",
 "%s password reset" => "reset hesla %s",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Při odesílání e-mailu nastala chyba, kontaktujte prosím svého administrátora.",
 "Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovení hesla byl odeslán na vaši e-mailovou adresu.<br>Pokud jej v krátké době neobdržíte, zkontrolujte váš koš a složku spam.<br>Pokud jej nenaleznete, kontaktujte svého správce.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Požadavek selhal!<br>Ujistili jste se, že vaše uživatelské jméno a e-mail jsou správně?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Na stránku přihlášení",
 "New password" => "Nové heslo",
 "Reset password" => "Obnovit heslo",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
+"For the best results, please consider using a GNU/Linux server instead." => "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
 "Personal" => "Osobní",
 "Users" => "Uživatelé",
 "Apps" => "Aplikace",
@@ -143,7 +149,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>",
-"Advanced" => "Pokročilé",
+"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",
@@ -154,7 +160,7 @@ $TRANSLATIONS = array(
 "Database host" => "Hostitel databáze",
 "Finish setup" => "Dokončit nastavení",
 "Finishing …" => "Dokončuji...",
-"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Tato aplikace potřebuje pro svou správnou funkčnost mít povolený javascript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte toto rozhraní.",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Tato aplikace vyžaduje pro svou správnou funkčnost povolený JavaScript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte toto rozhraní.",
 "%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.",
 "Log out" => "Odhlásit se",
 "Automatic logon rejected!" => "Automatické přihlášení odmítnuto!",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "zapamatovat",
 "Log in" => "Přihlásit",
 "Alternative Logins" => "Alternativní přihlášení",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej ty tam,<br><br>jen ti chci dát vědět, že %s sdílel »%s« s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej ty,<br><br>jen ti dávám vědět, že %s sdílí <strong>%s</strong> s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
 "This means only administrators can use the instance." => "To znamená, že pouze správci systému mohou aplikaci používat.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
diff --git a/core/l10n/cy_GB.php b/core/l10n/cy_GB.php
index aa10715d0a..f73f60d069 100644
--- a/core/l10n/cy_GB.php
+++ b/core/l10n/cy_GB.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "Tachwedd",
 "December" => "Rhagfyr",
 "Settings" => "Gosodiadau",
+"Saving..." => "Yn cadw...",
 "seconds ago" => "eiliad yn ôl",
 "_%n minute ago_::_%n minutes ago_" => array("","","",""),
 "_%n hour ago_::_%n hours ago_" => array("","","",""),
@@ -96,7 +97,6 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Heb gynhyrchydd rhifau hap diogel efallai y gall ymosodwr ragweld tocynnau ailosod cyfrinair a meddiannu eich cyfrif.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
 "Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>",
-"Advanced" => "Uwch",
 "Data folder" => "Plygell data",
 "Configure the database" => "Cyflunio'r gronfa ddata",
 "will be used" => "ddefnyddir",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 9c7fdc889f..d3384dac43 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s delte »%s« med sig",
 "Couldn't send mail to following users: %s " => "Kunne ikke sende mail til følgende brugere: %s",
 "Turned on maintenance mode" => "Startede vedligeholdelsestilstand",
 "Turned off maintenance mode" => "standsede vedligeholdelsestilstand",
 "Updated database" => "Opdaterede database",
-"Updating filecache, this may take really long..." => "Opdatere filcache, dette kan tage rigtigt lang tid...",
-"Updated filecache" => "Opdaterede filcache",
-"... %d%% done ..." => "... %d%% færdig ...",
 "No image or file provided" => "Ingen fil eller billede givet",
 "Unknown filetype" => "Ukendt filtype",
 "Invalid image" => "Ugyldigt billede",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "December",
 "Settings" => "Indstillinger",
+"Saving..." => "Gemmer...",
 "seconds ago" => "sekunder siden",
 "_%n minute ago_::_%n minutes ago_" => array("%n minut siden","%n minutter siden"),
 "_%n hour ago_::_%n hours ago_" => array("%n time siden","%n timer siden"),
@@ -59,6 +56,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(alle valgt)",
 "({count} selected)" => "({count} valgt)",
 "Error loading file exists template" => "Fejl ved inlæsning af; fil eksistere skabelon",
+"Very weak password" => "Meget svagt kodeord",
+"Weak password" => "Svagt kodeord",
+"So-so password" => "Jævnt kodeord",
+"Good password" => "Godt kodeord",
+"Strong password" => "Stærkt kodeord",
 "Shared" => "Delt",
 "Share" => "Del",
 "Error" => "Fejl",
@@ -106,6 +108,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
 "%s password reset" => "%s adgangskode nulstillet",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Der opstod et problem under afsending af emailen. Kontakt venligst systemadministratoren.",
 "Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linket til at nulstille dit kodeord er blevet sendt til din e-post. <br> Hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam / junk mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn var korrekt?",
@@ -143,7 +146,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
-"Advanced" => "Avanceret",
+"Storage & database" => "Lager & database",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
 "will be used" => "vil blive brugt",
@@ -166,7 +169,6 @@ $TRANSLATIONS = array(
 "remember" => "husk",
 "Log in" => "Log ind",
 "Alternative Logins" => "Alternative logins",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej med dig,<br><br>Dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det her!</a><br><br>Hej",
 "This ownCloud instance is currently in single user mode." => "Denne ownCloud instans er lige nu i enkeltbruger tilstand.",
 "This means only administrators can use the instance." => "Det betyder at det kun er administrator, som kan benytte ownCloud.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren, hvis denne meddelelse fortsætter eller optrådte uventet.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 9904aeb803..79edfb725d 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s teilte »%s« mit Dir",
+"Expiration date is in the past." => "Ablaufdatum liegt in der Vergangenheit.",
 "Couldn't send mail to following users: %s " => "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
 "Turned on maintenance mode" => "Wartungsmodus eingeschaltet",
 "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
 "Updated database" => "Datenbank aktualisiert",
-"Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...",
-"Updated filecache" => "Dateicache aktualisiert",
-"... %d%% done ..." => "... %d%% erledigt ...",
 "No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt",
 "Unknown filetype" => "Unbekannter Dateityp",
 "Invalid image" => "Ungültiges Bild",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "Dezember",
 "Settings" => "Einstellungen",
+"Saving..." => "Speichern...",
 "seconds ago" => "Gerade eben",
 "_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
 "_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(Alle ausgewählt)",
 "({count} selected)" => "({count} ausgewählt)",
 "Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage",
+"Very weak password" => "Sehr schwaches Passwort",
+"Weak password" => "Schwaches Passwort",
+"So-so password" => "Durchschnittliches Passwort",
+"Good password" => "Gutes Passwort",
+"Strong password" => "Starkes Passwort",
 "Shared" => "Geteilt",
 "Share" => "Teilen",
 "Error" => "Fehler",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
 "%s password reset" => "%s-Passwort zurücksetzen",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte kontaktiere deinen Administrator.",
 "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Deines Passwort ist an Deine E-Mail-Adresse geschickt worden.<br>Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/Dein Benutzername korrekt war?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Zur Login-Seite",
 "New password" => "Neues Passwort",
 "Reset password" => "Passwort zurücksetzen",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
+"For the best results, please consider using a GNU/Linux server instead." => "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
 "Personal" => "Persönlich",
 "Users" => "Benutzer",
 "Apps" => "Apps",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Advanced" => "Fortgeschritten",
+"Storage & database" => "Speicher & Datenbank",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
 "will be used" => "wird verwendet",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "merken",
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br/><br/>wollte Dich nur kurz informieren, dass %s gerade %s mit Dir geteilt hat.<br/><a href=\"%s\">Schau es Dir an.</a><br/><br/>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>wir möchten dich nur wissen lassen, dass %s <strong>%s</strong> mit dir geteilt hat.<br><a href=\"%s\">Ansehen!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
 "This means only administrators can use the instance." => "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktiere Deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
index ffcdde48d4..54c3946342 100644
--- a/core/l10n/de_AT.php
+++ b/core/l10n/de_AT.php
@@ -1,9 +1,37 @@
 <?php
 $TRANSLATIONS = array(
+"Sunday" => "Sonntag",
+"Monday" => "Montag",
+"Tuesday" => "Dienstag",
+"Wednesday" => "Mittwoch",
+"Thursday" => "Donnerstag",
+"Friday" => "Freitag",
+"Saturday" => "Samstag",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "März",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
+"Settings" => "Einstellungen",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
 "_%n day ago_::_%n days ago_" => array("",""),
 "_%n month ago_::_%n months ago_" => array("",""),
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Abbrechen",
+"Share" => "Freigeben",
+"Password" => "Passwort",
+"group" => "Gruppe",
+"Unshare" => "Teilung zurücknehmen",
+"can edit" => "kann bearbeiten",
+"Delete" => "Löschen",
+"Personal" => "Persönlich"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
index cdd9343823..42b8eb3bce 100644
--- a/core/l10n/de_CH.php
+++ b/core/l10n/de_CH.php
@@ -1,11 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s teilt »%s« mit Ihnen",
 "Turned on maintenance mode" => "Wartungsmodus eingeschaltet",
 "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
 "Updated database" => "Datenbank aktualisiert",
-"Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...",
-"Updated filecache" => "Dateicache aktualisiert",
 "Sunday" => "Sonntag",
 "Monday" => "Montag",
 "Tuesday" => "Dienstag",
@@ -26,6 +23,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "Dezember",
 "Settings" => "Einstellungen",
+"Saving..." => "Speichern...",
 "seconds ago" => "Gerade eben",
 "_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
 "_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"),
@@ -109,7 +107,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
 "will be used" => "wird verwendet",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index e9abf57a00..a0877e792e 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,14 +1,11 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s hat »%s« mit Ihnen geteilt",
+"Expiration date is in the past." => "Ablaufdatum liegt in der Vergangenheit.",
 "Couldn't send mail to following users: %s " => "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
 "Turned on maintenance mode" => "Wartungsmodus eingeschaltet ",
 "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
 "Updated database" => "Datenbank aktualisiert",
-"Updating filecache, this may take really long..." => "Aktualisiere Datei-Cache, dies könnte eine Weile dauern...",
-"Updated filecache" => "Datei-Cache aktualisiert",
-"... %d%% done ..." => "... %d%% erledigt ...",
-"No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt",
+"No image or file provided" => "Weder Bild noch ein Datei wurden zur Verfügung gestellt",
 "Unknown filetype" => "Unbekannter Dateityp",
 "Invalid image" => "Ungültiges Bild",
 "No temporary profile picture available, try again" => "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "Dezember",
 "Settings" => "Einstellungen",
+"Saving..." => "Speichern...",
 "seconds ago" => "Gerade eben",
 "_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
 "_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(Alle ausgewählt)",
 "({count} selected)" => "({count} ausgewählt)",
 "Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage",
+"Very weak password" => "Sehr schwaches Passwort",
+"Weak password" => "Schwaches Passwort",
+"So-so password" => "Passables Passwort",
+"Good password" => "Gutes Passwort",
+"Strong password" => "Starkes Passwort",
 "Shared" => "Geteilt",
 "Share" => "Teilen",
 "Error" => "Fehler",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
 "%s password reset" => "%s-Passwort zurücksetzen",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Beim Senden der E-Mail ist ein Problem aufgetreten, bitte kontaktieren Sie Ihren Administrator.",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Der Link zum Rücksetzen Ihres Passworts ist an Ihre E-Mail-Adresse gesendet worde.<br>Wenn Sie ihn nicht innerhalb einer vernünftigen Zeitspanne erhalten, prüfen Sie bitte Ihre Spam-Verzeichnisse.<br>Wenn er nicht dort ist, fragen Sie Ihren lokalen Administrator.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adresse/Nutzername korrekt waren?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Zur Login-Seite",
 "New password" => "Neues Passwort",
 "Reset password" => "Passwort zurücksetzen",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
+"For the best results, please consider using a GNU/Linux server instead." => "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
 "Personal" => "Persönlich",
 "Users" => "Benutzer",
 "Apps" => "Apps",
@@ -141,9 +147,9 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihr Server richtig konfigurieren können.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Advanced" => "Fortgeschritten",
+"Storage & database" => "Speicher & Datenbank",
 "Data folder" => "Datenverzeichnis",
 "Configure the database" => "Datenbank einrichten",
 "will be used" => "wird verwendet",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "merken",
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>%s hat %s mit Ihnen geteilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>wir möchten Sie wissen lassen, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Ansehen</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
 "This means only administrators can use the instance." => "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index f726a232f0..ed7792b726 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "Ο %s διαμοιράστηκε μαζί σας το »%s«",
 "Couldn't send mail to following users: %s " => "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
 "Turned on maintenance mode" => "Η κατάσταση συντήρησης ενεργοποιήθηκε",
 "Turned off maintenance mode" => "Η κατάσταση συντήρησης απενεργοποιήθηκε",
 "Updated database" => "Ενημερωμένη βάση δεδομένων",
-"Updating filecache, this may take really long..." => "Ενημέρωση αποθηκευμένων αρχείων, αυτό μπορεί να πάρα πολύ ώρα...",
-"Updated filecache" => "Ενημέρωση αποθηκευμένων αρχείων",
-"... %d%% done ..." => "... %d%% ολοκληρώθηκαν ...",
 "No image or file provided" => "Δεν δόθηκε εικόνα ή αρχείο",
 "Unknown filetype" => "Άγνωστος τύπος αρχείου",
 "Invalid image" => "Μη έγκυρη εικόνα",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "Νοέμβριος",
 "December" => "Δεκέμβριος",
 "Settings" => "Ρυθμίσεις",
+"Saving..." => "Γίνεται αποθήκευση...",
 "seconds ago" => "δευτερόλεπτα πριν",
 "_%n minute ago_::_%n minutes ago_" => array("%n λεπτό πριν","%n λεπτά πριν"),
 "_%n hour ago_::_%n hours ago_" => array("%n ώρα πριν","%n ώρες πριν"),
@@ -58,6 +55,10 @@ $TRANSLATIONS = array(
 "Continue" => "Συνέχεια",
 "(all selected)" => "(όλα τα επιλεγμένα)",
 "({count} selected)" => "({count} επιλέχθησαν)",
+"Very weak password" => "Πολύ αδύναμο συνθηματικό",
+"Weak password" => "Αδύναμο συνθηματικό",
+"Good password" => "Καλό συνθηματικό",
+"Strong password" => "Δυνατό συνθηματικό",
 "Shared" => "Κοινόχρηστα",
 "Share" => "Διαμοιρασμός",
 "Error" => "Σφάλμα",
@@ -105,6 +106,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ στείλτε αναφορά στην <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">κοινότητα ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
 "%s password reset" => "%s επαναφορά κωδικού πρόσβασης",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Παρουσιάστηκε σφάλμα κατά την αποστολή email, παρακαλώ επικοινωνήστε με τον διαχειριστή.",
 "Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ο σύνδεσμος για να επανακτήσετε τον κωδικό σας έχει σταλεί στο email <br>αν δεν το λάβετε μέσα σε ορισμένο διάστημα, ελέγξετε τους φακελλους σας spam/junk <br> αν δεν είναι εκεί ρωτήστε τον τοπικό σας διαχειριστή ",
 "Request failed!<br>Did you make sure your email/username was right?" => "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το email σας / username ειναι σωστο? ",
@@ -142,7 +144,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
 "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
-"Advanced" => "Για προχωρημένους",
 "Data folder" => "Φάκελος δεδομένων",
 "Configure the database" => "Ρύθμιση της βάσης δεδομένων",
 "will be used" => "θα χρησιμοποιηθούν",
@@ -165,12 +166,12 @@ $TRANSLATIONS = array(
 "remember" => "απομνημόνευση",
 "Log in" => "Είσοδος",
 "Alternative Logins" => "Εναλλακτικές Συνδέσεις",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το »%s« με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
 "This means only administrators can use the instance." => "Αυτό σημαίνει ότι μόνο διαχειριστές μπορούν να χρησιμοποιήσουν την εγκατάσταση.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.",
 "Thank you for your patience." => "Σας ευχαριστούμε για την υπομονή σας.",
 "Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο.",
+"This ownCloud instance is currently being updated, which may take a while." => "Αυτή η εγκατάσταση ownCloud ενημερώνεται, το οποίο μπορεί να πάρει κάποιο χρόνο.",
 "Please reload this page after a short time to continue using ownCloud." => "Παρακαλώ ανανεώστε αυτή τη σελίδα μετά από ένα σύντομο χρονικό διάστημα ώστε να συνεχίσετε να χρησιμοποιείτε το ownCloud."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index dc8b5b11fd..bc36f5a444 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s shared \"%s\" with you",
+"Expiration date is in the past." => "Expiration date is in the past.",
 "Couldn't send mail to following users: %s " => "Couldn't send mail to following users: %s ",
 "Turned on maintenance mode" => "Turned on maintenance mode",
 "Turned off maintenance mode" => "Turned off maintenance mode",
 "Updated database" => "Updated database",
-"Updating filecache, this may take really long..." => "Updating filecache, this may take a really long time...",
-"Updated filecache" => "Updated filecache",
-"... %d%% done ..." => "... %d%% done ...",
 "No image or file provided" => "No image or file provided",
 "Unknown filetype" => "Unknown filetype",
 "Invalid image" => "Invalid image",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "December",
 "Settings" => "Settings",
+"Saving..." => "Saving...",
 "seconds ago" => "seconds ago",
 "_%n minute ago_::_%n minutes ago_" => array("%n minute ago","%n minutes ago"),
 "_%n hour ago_::_%n hours ago_" => array("%n hour ago","%n hours ago"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(all selected)",
 "({count} selected)" => "({count} selected)",
 "Error loading file exists template" => "Error loading file exists template",
+"Very weak password" => "Very weak password",
+"Weak password" => "Weak password",
+"So-so password" => "So-so password",
+"Good password" => "Good password",
+"Strong password" => "Strong password",
 "Shared" => "Shared",
 "Share" => "Share",
 "Error" => "Error",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.",
 "%s password reset" => "%s password reset",
+"A problem has occurred whilst sending the email, please contact your administrator." => "A problem has occurred whilst sending the email, please contact your administrator.",
 "Use the following link to reset your password: {link}" => "Use the following link to reset your password: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator .",
 "Request failed!<br>Did you make sure your email/username was right?" => "Request failed!<br>Did you make sure your email/username was correct?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "To login page",
 "New password" => "New password",
 "Reset password" => "Reset password",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
+"For the best results, please consider using a GNU/Linux server instead." => "For the best results, please consider using a GNU/Linux server instead.",
 "Personal" => "Personal",
 "Users" => "Users",
 "Apps" => "Apps",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Create an <strong>admin account</strong>",
-"Advanced" => "Advanced",
+"Storage & database" => "Storage & database",
 "Data folder" => "Data folder",
 "Configure the database" => "Configure the database",
 "will be used" => "will be used",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "remember",
 "Log in" => "Log in",
 "Alternative Logins" => "Alternative Logins",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "This ownCloud instance is currently in single user mode.",
 "This means only administrators can use the instance." => "This means only administrators can use the instance.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contact your system administrator if this message persists or appeared unexpectedly.",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 2f779a551b..f264b7ed7a 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s kunhavigis “%s” kun vi",
+"Updated database" => "Ĝisdatiĝis datumbazo",
+"Unknown filetype" => "Ne konatas dosiertipo",
+"Invalid image" => "Ne validas bildo",
 "Sunday" => "dimanĉo",
 "Monday" => "lundo",
 "Tuesday" => "mardo",
@@ -21,14 +23,15 @@ $TRANSLATIONS = array(
 "November" => "Novembro",
 "December" => "Decembro",
 "Settings" => "Agordo",
+"Saving..." => "Konservante...",
 "seconds ago" => "sekundoj antaŭe",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("antaŭ %n minuto","antaŭ %n minutoj"),
+"_%n hour ago_::_%n hours ago_" => array("antaŭ %n horo","antaŭ %n horoj"),
 "today" => "hodiaŭ",
 "yesterday" => "hieraŭ",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("antaŭ %n tago","antaŭ %n tagoj"),
 "last month" => "lastamonate",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("antaŭ %n monato","antaŭ %n monatoj"),
 "months ago" => "monatoj antaŭe",
 "last year" => "lastajare",
 "years ago" => "jaroj antaŭe",
@@ -36,8 +39,13 @@ $TRANSLATIONS = array(
 "Yes" => "Jes",
 "No" => "Ne",
 "Ok" => "Akcepti",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosierkonflikto","{count} dosierkonfliktoj"),
+"One file conflict" => "Unu dosierkonflikto",
+"Which files do you want to keep?" => "Kiujn dosierojn vi volas konservi?",
+"If you select both versions, the copied file will have a number added to its name." => "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo.",
 "Cancel" => "Nuligi",
+"(all selected)" => "(ĉiuj elektitas)",
+"({count} selected)" => "({count} elektitas)",
 "Shared" => "Dividita",
 "Share" => "Kunhavigi",
 "Error" => "Eraro",
@@ -46,6 +54,8 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Eraro dum ŝanĝo de permesoj",
 "Shared with you and the group {group} by {owner}" => "Kunhavigita kun vi kaj la grupo {group} de {owner}",
 "Shared with you by {owner}" => "Kunhavigita kun vi de {owner}",
+"Share with user or group …" => "Kunhavigi kun uzanto aŭ grupo...",
+"Share link" => "Konhavigi ligilon",
 "Password protect" => "Protekti per pasvorto",
 "Password" => "Pasvorto",
 "Email link to person" => "Retpoŝti la ligilon al ulo",
@@ -58,6 +68,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "Rekunhavigo ne permesatas",
 "Shared in {item} with {user}" => "Kunhavigita en {item} kun {user}",
 "Unshare" => "Malkunhavigi",
+"notify by email" => "avizi per retpoŝto",
 "can edit" => "povas redakti",
 "access control" => "alirkontrolo",
 "create" => "krei",
@@ -71,8 +82,12 @@ $TRANSLATIONS = array(
 "Email sent" => "La retpoŝtaĵo sendiĝis",
 "Warning" => "Averto",
 "The object type is not specified." => "Ne indikiĝis tipo de la objekto.",
+"Enter new" => "Enigu novan",
 "Delete" => "Forigi",
 "Add" => "Aldoni",
+"Edit tags" => "Redakti etikedojn",
+"No tags selected for deletion." => "Neniu etikedo elektitas por forigo.",
+"Please reload the page." => "Bonvolu reŝargi la paĝon.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouda komunumo</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
 "Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
@@ -89,13 +104,18 @@ $TRANSLATIONS = array(
 "Apps" => "Aplikaĵoj",
 "Admin" => "Administranto",
 "Help" => "Helpo",
+"Error loading tags" => "Eraris ŝargo de etikedoj",
+"Tag already exists" => "La etikedo jam ekzistas",
+"Error deleting tag(s)" => "Eraris forigo de etikedo(j)",
+"Error tagging" => "Eraris etikedado",
+"Error untagging" => "Eraris maletikedado",
 "Access forbidden" => "Aliro estas malpermesata",
 "Cloud not found" => "La nubo ne estas trovita",
 "Security Warning" => "Sekureca averto",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
-"Advanced" => "Progresinta",
 "Data folder" => "Datuma dosierujo",
 "Configure the database" => "Agordi la datumbazon",
 "will be used" => "estos uzata",
@@ -105,15 +125,18 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Datumbaza tabelospaco",
 "Database host" => "Datumbaza gastigo",
 "Finish setup" => "Fini la instalon",
+"Finishing …" => "Finante...",
 "%s is available. Get more information on how to update." => "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi.",
 "Log out" => "Elsaluti",
 "Automatic logon rejected!" => "La aŭtomata ensaluto malakceptiĝis!",
 "If you did not change your password recently, your account may be compromised!" => "Se vi ne ŝanĝis vian pasvorton lastatempe, via konto eble kompromitas!",
 "Please change your password to secure your account again." => "Bonvolu ŝanĝi vian pasvorton por sekurigi vian konton ree.",
+"Please contact your administrator." => "Bonvolu kontakti vian administranton.",
 "Lost your password?" => "Ĉu vi perdis vian pasvorton?",
 "remember" => "memori",
 "Log in" => "Ensaluti",
 "Alternative Logins" => "Alternativaj ensalutoj",
+"Thank you for your patience." => "Dankon pro via pacienco.",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud ĝisdatiĝas al eldono %s, tio ĉi povas daŭri je iom da tempo."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 6bee4fabaf..52f1a15089 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s ha compatido  »%s« contigo",
+"Expiration date is in the past." => "Ha pasado la fecha de caducidad",
 "Couldn't send mail to following users: %s " => "No se pudo enviar el mensaje a los siguientes usuarios: %s",
 "Turned on maintenance mode" => "Modo mantenimiento activado",
 "Turned off maintenance mode" => "Modo mantenimiento desactivado",
 "Updated database" => "Base de datos actualizada",
-"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar bastante tiempo...",
-"Updated filecache" => "Caché de archivos actualizada",
-"... %d%% done ..." => "... %d%% hecho ...",
 "No image or file provided" => "No se especificó ningún archivo o imagen",
 "Unknown filetype" => "Tipo de archivo desconocido",
 "Invalid image" => "Imagen inválida",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "Noviembre",
 "December" => "Diciembre",
 "Settings" => "Ajustes",
+"Saving..." => "Guardando...",
 "seconds ago" => "segundos antes",
 "_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
 "_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(seleccionados todos)",
 "({count} selected)" => "({count} seleccionados)",
 "Error loading file exists template" => "Error cargando plantilla de archivo existente",
+"Very weak password" => "Contraseña muy débil",
+"Weak password" => "Contraseña débil",
+"So-so password" => "Contraseña pasable",
+"Good password" => "Contraseña buena",
+"Strong password" => "Contraseña muy buena",
 "Shared" => "Compartido",
 "Share" => "Compartir",
 "Error" => "Error",
@@ -82,7 +85,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "No se permite compartir de nuevo",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
 "Unshare" => "Dejar de compartir",
-"notify by email" => "notificar al usuario por correo electrónico",
+"notify by email" => "notificar por correo electrónico",
 "can edit" => "puede editar",
 "access control" => "control de acceso",
 "create" => "crear",
@@ -102,10 +105,11 @@ $TRANSLATIONS = array(
 "Edit tags" => "Editar etiquetas",
 "Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}",
 "No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.",
-"Please reload the page." => "Vuelva a cargar la página.",
+"Please reload the page." => "Recargue/Actualice la página",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización ha fracasado. Por favor, informe de este problema a la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">Comunidad de ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
 "%s password reset" => "%s restablecer contraseña",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Ocurrió un problema al enviar el mensaje de correo electrónico. Contacte a su administrador.",
 "Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "El enlace para restablecer la contraseña ha sido enviada a su correo electrónico. <br> Si no lo recibe en un plazo razonable de tiempo, revise su carpeta de spam / correo no deseado. <br> Si no está allí, pregunte a su administrador local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "La petición ha fallado! <br> ¿Está seguro de que su dirección de correo electrónico o nombre de usuario era correcto?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "A la página de inicio de sesión",
 "New password" => "Nueva contraseña",
 "Reset password" => "Restablecer contraseña",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
+"For the best results, please consider using a GNU/Linux server instead." => "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
 "Personal" => "Personal",
 "Users" => "Usuarios",
 "Apps" => "Aplicaciones",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
-"Advanced" => "Avanzado",
+"Storage & database" => "Almacenamiento y base de datos",
 "Data folder" => "Directorio de datos",
 "Configure the database" => "Configurar la base de datos",
 "will be used" => "se utilizarán",
@@ -166,13 +172,13 @@ $TRANSLATIONS = array(
 "remember" => "recordar",
 "Log in" => "Entrar",
 "Alternative Logins" => "Inicios de sesión alternativos",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hola:<br><br>tan solo queremos informarte que %s compartió «%s» contigo.<br><a href=\"%s\">¡Míralo acá!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hola:<br><br>Te comentamos que %s compartió <strong>%s</strong> contigo.<br><a href=\"%s\">¡Échale un vistazo!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Esta instalación de ownCloud se encuentra en modo de usuario único.",
 "This means only administrators can use the instance." => "Esto quiere decir que solo un administrador puede usarla.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
 "Thank you for your patience." => "Gracias por su paciencia.",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
 "This ownCloud instance is currently being updated, which may take a while." => "Esta versión de owncloud se está actualizando, esto puede demorar un tiempo.",
-"Please reload this page after a short time to continue using ownCloud." => "Por favor , recargue esta instancia de onwcloud tras un corto periodo de tiempo y continue usándolo."
+"Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue la página tras un corto periodo de tiempo para continuar usando ownCloud"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 3b77aa71e2..b5b37d4825 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -1,14 +1,14 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s compartió \"%s\" con vos",
+"Couldn't send mail to following users: %s " => "No se pudieron mandar correos a los siguientes usuarios: %s",
 "Turned on maintenance mode" => "Modo de mantenimiento activado",
 "Turned off maintenance mode" => "Modo de mantenimiento desactivado",
 "Updated database" => "Base de datos actualizada",
-"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar mucho tiempo...",
-"Updated filecache" => "Caché de archivos actualizada",
-"... %d%% done ..." => "... %d%% hecho ...",
+"No image or file provided" => "No se ha proveído de una imágen o archivo.",
 "Unknown filetype" => "Tipo de archivo desconocido",
 "Invalid image" => "Imagen inválida",
+"No temporary profile picture available, try again" => "No hay una imágen temporal del perfil disponible, intente de nuevo",
+"No crop data provided" => "No se proveyeron datos de recorte",
 "Sunday" => "Domingo",
 "Monday" => "Lunes",
 "Tuesday" => "Martes",
@@ -29,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "noviembre",
 "December" => "diciembre",
 "Settings" => "Configuración",
+"Saving..." => "Guardando...",
 "seconds ago" => "segundos atrás",
 "_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
 "_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
@@ -41,11 +42,20 @@ $TRANSLATIONS = array(
 "last year" => "el año pasado",
 "years ago" => "años atrás",
 "Choose" => "Elegir",
+"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
 "Yes" => "Sí",
 "No" => "No",
 "Ok" => "Aceptar",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Error loading message template: {error}" => "Error cargando la plantilla del mensaje: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("un archivo en conflicto","{count} archivos en conflicto"),
+"One file conflict" => "Un archivo en conflicto",
+"Which files do you want to keep?" => "¿Qué archivos deseas retener?",
+"If you select both versions, the copied file will have a number added to its name." => "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre.",
 "Cancel" => "Cancelar",
+"Continue" => "Continuar",
+"(all selected)" => "(todos están seleccionados)",
+"({count} selected)" => "({count} seleccionados)",
+"Error loading file exists template" => "Error cargando la plantilla de archivo existente",
 "Shared" => "Compartido",
 "Share" => "Compartir",
 "Error" => "Error",
@@ -54,6 +64,8 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Error al cambiar permisos",
 "Shared with you and the group {group} by {owner}" => "Compartido con vos y el grupo {group} por {owner}",
 "Shared with you by {owner}" => "Compartido con vos por {owner}",
+"Share with user or group …" => "Compartir con usuario o grupo ...",
+"Share link" => "Compartir vínculo",
 "Password protect" => "Proteger con contraseña ",
 "Password" => "Contraseña",
 "Allow Public Upload" => "Permitir Subida Pública",
@@ -67,6 +79,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "No se permite volver a compartir",
 "Shared in {item} with {user}" => "Compartido en {item} con {user}",
 "Unshare" => "Dejar de compartir",
+"notify by email" => "notificar por correo",
 "can edit" => "podés editar",
 "access control" => "control de acceso",
 "create" => "crear",
@@ -80,8 +93,13 @@ $TRANSLATIONS = array(
 "Email sent" => "e-mail mandado",
 "Warning" => "Atención",
 "The object type is not specified." => "El tipo de objeto no está especificado. ",
+"Enter new" => "Entrar nuevo",
 "Delete" => "Borrar",
 "Add" => "Agregar",
+"Edit tags" => "Editar etiquetas",
+"Error loading dialog template: {error}" => "Error cargando la plantilla de dialogo: {error}",
+"No tags selected for deletion." => "No se han seleccionado etiquetas para eliminar.",
+"Please reload the page." => "Por favor, recargue la página.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La actualización no pudo ser completada. Por favor, reportá el inconveniente a la comunidad <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
 "%s password reset" => "%s restablecer contraseña",
@@ -102,8 +120,18 @@ $TRANSLATIONS = array(
 "Apps" => "Apps",
 "Admin" => "Administración",
 "Help" => "Ayuda",
+"Error loading tags" => "Error cargando las etiquetas",
+"Tag already exists" => "La etiqueta ya existe",
+"Error deleting tag(s)" => "Error borrando etiquetas(s)",
+"Error tagging" => "Error al etiquetar",
+"Error untagging" => "Error al sacar la etiqueta",
+"Error favoriting" => "Error al favorecer",
+"Error unfavoriting" => "Error al desfavorecer",
 "Access forbidden" => "Acceso prohibido",
 "Cloud not found" => "No se encontró ownCloud",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "¡Hola!\n\nsólo te quería decir que %s acaba de compartir %s contigo.\nVerlo: %s\n\n",
+"The share will expire on %s." => "El compartir expirará en %s.",
+"Cheers!" => "¡Saludos!",
 "Security Warning" => "Advertencia de seguridad",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
@@ -112,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
-"Advanced" => "Avanzado",
 "Data folder" => "Directorio de almacenamiento",
 "Configure the database" => "Configurar la base de datos",
 "will be used" => "se usarán",
@@ -122,15 +149,25 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Huésped de la base de datos",
 "Finish setup" => "Completar la instalación",
+"Finishing …" => "Finalizando...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Esta aplicación requiere de JavaScript para su correcto funcionamiento. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> y recargue.",
 "%s is available. Get more information on how to update." => "%s está disponible. Obtené más información sobre cómo actualizar.",
 "Log out" => "Cerrar la sesión",
 "Automatic logon rejected!" => "¡El inicio de sesión automático fue rechazado!",
 "If you did not change your password recently, your account may be compromised!" => "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!",
 "Please change your password to secure your account again." => "Por favor, cambiá tu contraseña para incrementar la seguridad de tu cuenta.",
+"Server side authentication failed!" => "¡Falló la autenticación del servidor!",
+"Please contact your administrator." => "Por favor, contacte a su administrador.",
 "Lost your password?" => "¿Perdiste tu contraseña?",
 "remember" => "recordame",
 "Log in" => "Iniciar sesión",
 "Alternative Logins" => "Nombre alternativos de usuarios",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede demorar un rato."
+"This ownCloud instance is currently in single user mode." => "Esta instancia de ownCloud está en modo de usuario único.",
+"This means only administrators can use the instance." => "Esto significa que solo administradores pueden usar esta instancia.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente.",
+"Thank you for your patience." => "Gracias por su paciencia.",
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, puede demorar un rato.",
+"This ownCloud instance is currently being updated, which may take a while." => "Esta instancia de ownClod está siendo actualizada, puede tardar un momento.",
+"Please reload this page after a short time to continue using ownCloud." => "Por favor, recargue esta página después de un tiempo para continuar usando ownCloud."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_CL.php b/core/l10n/es_CL.php
index 819cc68a1c..b89e6575c5 100644
--- a/core/l10n/es_CL.php
+++ b/core/l10n/es_CL.php
@@ -1,12 +1,50 @@
 <?php
 $TRANSLATIONS = array(
+"Sunday" => "Domingo",
+"Monday" => "Lunes",
+"Tuesday" => "Martes",
+"Wednesday" => "Miércoles",
+"Thursday" => "Jueves",
+"Friday" => "Viernes",
+"Saturday" => "Sábado",
+"January" => "Enero",
+"February" => "Febrero",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Mayo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Agosto",
+"September" => "Septiembre",
+"October" => "Octubre",
+"November" => "Noviembre",
+"December" => "Diciembre",
 "Settings" => "Configuración",
+"seconds ago" => "segundos antes",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "hoy",
+"yesterday" => "ayer",
 "_%n day ago_::_%n days ago_" => array("",""),
+"last month" => "mes anterior",
 "_%n month ago_::_%n months ago_" => array("",""),
+"months ago" => "meses antes",
+"last year" => "último año",
+"years ago" => "años anteriores",
+"Choose" => "Choose",
+"Yes" => "Si",
+"No" => "No",
+"Ok" => "Ok",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Cancelar",
+"Shared" => "Compartido",
+"Share" => "Compartir",
+"Error" => "Error",
+"Error while sharing" => "Ocurrió un error mientras compartía",
+"Error while unsharing" => "Ocurrió un error mientras dejaba de compartir",
+"Error while changing permissions" => "Ocurrió un error mientras se cambiaban los permisos",
 "Password" => "Clave",
+"The object type is not specified." => "El tipo de objeto no está especificado.",
 "Username" => "Usuario"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
index 776233c1ab..6a90e3d778 100644
--- a/core/l10n/es_MX.php
+++ b/core/l10n/es_MX.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s ha compartido  »%s« contigo",
 "Couldn't send mail to following users: %s " => "No se pudo enviar el mensaje a los siguientes usuarios: %s",
 "Turned on maintenance mode" => "Modo mantenimiento activado",
 "Turned off maintenance mode" => "Modo mantenimiento desactivado",
 "Updated database" => "Base de datos actualizada",
-"Updating filecache, this may take really long..." => "Actualizando caché de archivos, esto puede tardar bastante tiempo...",
-"Updated filecache" => "Caché de archivos actualizada",
-"... %d%% done ..." => "... %d%% hecho ...",
 "No image or file provided" => "No se especificó ningún archivo o imagen",
 "Unknown filetype" => "Tipo de archivo desconocido",
 "Invalid image" => "Imagen inválida",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "Noviembre",
 "December" => "Diciembre",
 "Settings" => "Ajustes",
+"Saving..." => "Guardando...",
 "seconds ago" => "segundos antes",
 "_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
 "_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
@@ -143,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
-"Advanced" => "Avanzado",
 "Data folder" => "Directorio de datos",
 "Configure the database" => "Configurar la base de datos",
 "will be used" => "se utilizarán",
@@ -166,7 +162,6 @@ $TRANSLATIONS = array(
 "remember" => "recordar",
 "Log in" => "Entrar",
 "Alternative Logins" => "Accesos Alternativos",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hola:<br><br>tan solo queremos informarte que %s compartió «%s» contigo.<br><a href=\"%s\">¡Míralo acá!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Esta instalación de ownCloud se encuentra en modo de usuario único.",
 "This means only administrators can use the instance." => "Esto quiere decir que solo un administrador puede usarla.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 53928510e1..5a2e34ff3a 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s jagas sinuga »%s«",
 "Couldn't send mail to following users: %s " => "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
 "Turned on maintenance mode" => "Haldusrežiimis sisse lülitatud",
 "Turned off maintenance mode" => "Haldusrežiimis välja lülitatud",
 "Updated database" => "Uuendatud andmebaas",
-"Updating filecache, this may take really long..." => "Failipuhvri uuendamine, see võib kesta väga kaua...",
-"Updated filecache" => "Uuendatud failipuhver",
-"... %d%% done ..." => "... %d%% tehtud ...",
 "No image or file provided" => "Ühtegi pilti või faili pole pakutud",
 "Unknown filetype" => "Tundmatu failitüüp",
 "Invalid image" => "Vigane pilt",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "Detsember",
 "Settings" => "Seaded",
+"Saving..." => "Salvestamine...",
 "seconds ago" => "sekundit tagasi",
 "_%n minute ago_::_%n minutes ago_" => array("%n minut tagasi","%n minutit tagasi"),
 "_%n hour ago_::_%n hours ago_" => array("%n tund tagasi","%n tundi tagasi"),
@@ -132,7 +129,7 @@ $TRANSLATIONS = array(
 "Error unfavoriting" => "Viga lemmikutest eemaldamisel",
 "Access forbidden" => "Ligipääs on keelatud",
 "Cloud not found" => "Pilve ei leitud",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei,\n\nlihtsalt annan sulle teada, et %s jagas sulle välja %s.\nVaata seda: %s\n\n",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n",
 "The share will expire on %s." => "Jagamine aegub %s.",
 "Cheers!" => "Terekest!",
 "Security Warning" => "Turvahoiatus",
@@ -143,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
 "Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
-"Advanced" => "Täpsem",
 "Data folder" => "Andmete kaust",
 "Configure the database" => "Seadista andmebaasi",
 "will be used" => "kasutatakse",
@@ -166,7 +162,6 @@ $TRANSLATIONS = array(
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
 "Alternative Logins" => "Alternatiivsed sisselogimisviisid",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sulle välja »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "See ownCloud on momendil seadistatud ühe kasutaja jaoks.",
 "This means only administrators can use the instance." => "See tähendab, et seda saavad kasutada ainult administraatorid.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index ff74606545..33c98fb9b9 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du",
 "Couldn't send mail to following users: %s " => "Ezin izan da posta bidali hurrengo erabiltzaileei: %s",
 "Turned on maintenance mode" => "Mantenu modua gaitu da",
 "Turned off maintenance mode" => "Mantenu modua desgaitu da",
 "Updated database" => "Datu basea eguneratu da",
-"Updating filecache, this may take really long..." => "Fitxategi katxea eguneratzen, honek oso denbora luzea har dezake...",
-"Updated filecache" => "Fitxategi katxea eguneratu da",
-"... %d%% done ..." => "... %d%% egina ...",
 "No image or file provided" => "Ez da irudi edo fitxategirik zehaztu",
 "Unknown filetype" => "Fitxategi mota ezezaguna",
 "Invalid image" => "Baliogabeko irudia",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "Azaroa",
 "December" => "Abendua",
 "Settings" => "Ezarpenak",
+"Saving..." => "Gordetzen...",
 "seconds ago" => "segundu",
 "_%n minute ago_::_%n minutes ago_" => array("orain dela minutu %n","orain dela %n minutu"),
 "_%n hour ago_::_%n hours ago_" => array("orain dela ordu %n","orain dela %n ordu"),
@@ -143,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
 "Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
-"Advanced" => "Aurreratua",
 "Data folder" => "Datuen karpeta",
 "Configure the database" => "Konfiguratu datu basea",
 "will be used" => "erabiliko da",
@@ -166,7 +162,6 @@ $TRANSLATIONS = array(
 "remember" => "gogoratu",
 "Log in" => "Hasi saioa",
 "Alternative Logins" => "Beste erabiltzaile izenak",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.<br><a href=\"%s\">\nIkusi ezazu</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "ownCloud instantzia hau erabiltzaile bakar moduan dago.",
 "This means only administrators can use the instance." => "Honek administradoreak bakarrik erabili dezakeela esan nahi du.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.",
diff --git a/core/l10n/eu_ES.php b/core/l10n/eu_ES.php
new file mode 100644
index 0000000000..3606866bf7
--- /dev/null
+++ b/core/l10n/eu_ES.php
@@ -0,0 +1,12 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "Ezeztatu",
+"Delete" => "Ezabatu",
+"Personal" => "Pertsonala"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index bcb8bf2576..3e7e246e82 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
 "Sunday" => "یکشنبه",
 "Monday" => "دوشنبه",
 "Tuesday" => "سه شنبه",
@@ -21,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "نوامبر",
 "December" => "دسامبر",
 "Settings" => "تنظیمات",
+"Saving..." => "در حال ذخیره سازی...",
 "seconds ago" => "ثانیه‌ها پیش",
 "_%n minute ago_::_%n minutes ago_" => array(""),
 "_%n hour ago_::_%n hours ago_" => array(""),
@@ -46,6 +46,7 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "خطا در حال تغییر مجوز",
 "Shared with you and the group {group} by {owner}" => "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
 "Shared with you by {owner}" => "به اشتراک گذاشته شده با شما توسط { دارنده}",
+"Share link" => "اشتراک گذاشتن لینک",
 "Password protect" => "نگهداری کردن رمز عبور",
 "Password" => "گذرواژه",
 "Allow Public Upload" => "اجازه آپلود عمومی",
@@ -101,7 +102,6 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "بدون وجود یک تولید کننده اعداد تصادفی امن ، یک مهاجم ممکن است این قابلیت را داشته باشد که پیشگویی کند پسوورد های راه انداز گرفته شده و کنترلی روی حساب کاربری شما داشته باشد .",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
 "Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
-"Advanced" => "پیشرفته",
 "Data folder" => "پوشه اطلاعاتی",
 "Configure the database" => "پایگاه داده برنامه ریزی شدند",
 "will be used" => "استفاده خواهد شد",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 4109ea8e89..0af7503ee9 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -1,17 +1,15 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
+"Expiration date is in the past." => "Päättymispäivä on menneisyydessä.",
 "Couldn't send mail to following users: %s " => "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
 "Turned on maintenance mode" => "Siirrytty ylläpitotilaan",
 "Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä",
 "Updated database" => "Tietokanta ajan tasalla",
-"Updating filecache, this may take really long..." => "Päivitetään tiedostojen välimuistia, tämä saattaa kestää todella kauan...",
-"Updated filecache" => "Tiedostojen välimuisti päivitetty",
-"... %d%% done ..." => "... %d%% valmis ...",
 "No image or file provided" => "Kuvaa tai tiedostoa ei määritelty",
 "Unknown filetype" => "Tuntematon tiedostotyyppi",
 "Invalid image" => "Virhellinen kuva",
 "No temporary profile picture available, try again" => "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen",
+"No crop data provided" => "Puutteellinen tieto",
 "Sunday" => "sunnuntai",
 "Monday" => "maanantai",
 "Tuesday" => "tiistai",
@@ -32,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "marraskuu",
 "December" => "joulukuu",
 "Settings" => "Asetukset",
+"Saving..." => "Tallennetaan...",
 "seconds ago" => "sekuntia sitten",
 "_%n minute ago_::_%n minutes ago_" => array("%n minuutti sitten","%n minuuttia sitten"),
 "_%n hour ago_::_%n hours ago_" => array("%n tunti sitten","%n tuntia sitten"),
@@ -44,6 +43,7 @@ $TRANSLATIONS = array(
 "last year" => "viime vuonna",
 "years ago" => "vuotta sitten",
 "Choose" => "Valitse",
+"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
 "Yes" => "Kyllä",
 "No" => "Ei",
 "Ok" => "Ok",
@@ -56,6 +56,12 @@ $TRANSLATIONS = array(
 "Continue" => "Jatka",
 "(all selected)" => "(kaikki valittu)",
 "({count} selected)" => "({count} valittu)",
+"Error loading file exists template" => "Virhe ladatessa mallipohjaa",
+"Very weak password" => "Erittäin heikko salasana",
+"Weak password" => "Heikko salasana",
+"So-so password" => "Kohtalainen salasana",
+"Good password" => "Hyvä salasana",
+"Strong password" => "Vahva salasana",
 "Shared" => "Jaettu",
 "Share" => "Jaa",
 "Error" => "Virhe",
@@ -92,15 +98,18 @@ $TRANSLATIONS = array(
 "Sending ..." => "Lähetetään...",
 "Email sent" => "Sähköposti lähetetty",
 "Warning" => "Varoitus",
+"The object type is not specified." => "The object type is not specified.",
 "Enter new" => "Kirjoita uusi",
 "Delete" => "Poista",
 "Add" => "Lisää",
 "Edit tags" => "Muokkaa tunnisteita",
+"Error loading dialog template: {error}" => "Virhe ladatessa keskustelupohja: {error}",
 "No tags selected for deletion." => "Tunnisteita ei valittu poistettavaksi.",
 "Please reload the page." => "Päivitä sivu.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-yhteisölle</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
 "%s password reset" => "%s salasanan nollaus",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Sähköpostia lähettäessä tapahtui virhe, ota yhteys järjestelmän ylläpitäjään.",
 "Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Linkki salasanan nollaamiseen on lähetetty sähköpostiisi.<br>Jos et saa viestiä pian, tarkista roskapostikansiosi.<br>Jos et löydä viestiä roskapostinkaan seasta, ota yhteys ylläpitäjään.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuksesi oikein?",
@@ -121,18 +130,24 @@ $TRANSLATIONS = array(
 "Error loading tags" => "Virhe tunnisteita ladattaessa",
 "Tag already exists" => "Tunniste on jo olemassa",
 "Error deleting tag(s)" => "Virhe tunnisteita poistaessa",
+"Error tagging" => "Tunnisteiden kirjoitusvirhe",
+"Error untagging" => "Tunisteiden poisto virhe",
+"Error favoriting" => "Suosituksen kirjoitusvirhe",
+"Error unfavoriting" => "Suosituksen poisto virhe",
 "Access forbidden" => "Pääsy estetty",
 "Cloud not found" => "Pilveä ei löydy",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
 "The share will expire on %s." => "Jakaminen päättyy %s.",
+"Cheers!" => "Kippis!",
 "Security Warning" => "Turvallisuusvaroitus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Turvallista satunnaislukugeneraattoria ei ole käytettävissä, ota käyttöön PHP:n OpenSSL-laajennus",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ilman turvallinen satunnaislukugeneraattori, hyökkääjä saattaa pystyä ennustamaan salasanan tunnuksineen ja ottaa tilisi.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
 "Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
-"Advanced" => "Lisäasetukset",
+"Storage & database" => "Tallennus ja tietokanta",
 "Data folder" => "Datakansio",
 "Configure the database" => "Muokkaa tietokantaa",
 "will be used" => "käytetään",
@@ -155,7 +170,7 @@ $TRANSLATIONS = array(
 "remember" => "muista",
 "Log in" => "Kirjaudu sisään",
 "Alternative Logins" => "Vaihtoehtoiset kirjautumiset",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei sinä!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Tutustu siihen!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei!<br><br>%s jakoi kanssasi kohteen <strong>%s</strong>.<br><a href=\"%s\">Tutustu siihen!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Tämä ownCloud-asennus on parhaillaan single user -tilassa.",
 "This means only administrators can use the instance." => "Se tarkoittaa, että vain ylläpitäjät voivat nyt käyttää tätä ownCloudia.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Ota yhteys järjestelmän ylläpitäjään, jos tämä viesti ilmenee uudelleen tai odottamatta.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index d73355a4e2..3754e8c9e0 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s partagé »%s« avec vous",
 "Couldn't send mail to following users: %s " => "Impossible d'envoyer un mail aux utilisateurs suivant : %s",
 "Turned on maintenance mode" => "Basculé en mode maintenance",
 "Turned off maintenance mode" => "Basculé en mode production (non maintenance)",
 "Updated database" => "Base de données mise à jour",
-"Updating filecache, this may take really long..." => "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue...",
-"Updated filecache" => "Cache de fichier mis à jour",
-"... %d%% done ..." => "... %d%% effectué ...",
 "No image or file provided" => "Aucune image ou fichier fourni",
 "Unknown filetype" => "Type de fichier inconnu",
 "Invalid image" => "Image invalide",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "novembre",
 "December" => "décembre",
 "Settings" => "Paramètres",
+"Saving..." => "Enregistrement...",
 "seconds ago" => "il y a quelques secondes",
 "_%n minute ago_::_%n minutes ago_" => array("il y a %n minute","il y a %n minutes"),
 "_%n hour ago_::_%n hours ago_" => array("Il y a %n heure","Il y a %n heures"),
@@ -59,6 +56,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(tous sélectionnés)",
 "({count} selected)" => "({count} sélectionnés)",
 "Error loading file exists template" => "Erreur de chargement du modèle de fichier existant",
+"Very weak password" => "Mot de passe de très faible sécurité",
+"Weak password" => "Mot de passe de faible sécurité",
+"So-so password" => "Mot de passe de sécurité tout juste acceptable",
+"Good password" => "Mot de passe de sécurité suffisante",
+"Strong password" => "Mot de passe de forte sécurité",
 "Shared" => "Partagé",
 "Share" => "Partager",
 "Error" => "Erreur",
@@ -106,6 +108,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise à jour a échoué. Veuillez signaler ce problème à la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communauté ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud.",
 "%s password reset" => "Réinitialisation de votre mot de passe %s",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez contacter votre administrateur.",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Le lien permettant de réinitialiser votre mot de passe vous a été transmis.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifier votre boîte de pourriels.<br>Au besoin, contactez votre administrateur local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateur?",
@@ -143,7 +146,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire data est certainement accessible depuis l'internet car le fichier .htaccess ne semble pas fonctionner",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
-"Advanced" => "Avancé",
+"Storage & database" => "Support de stockage & base de données",
 "Data folder" => "Répertoire des données",
 "Configure the database" => "Configurer la base de données",
 "will be used" => "sera utilisé",
@@ -166,7 +169,7 @@ $TRANSLATIONS = array(
 "remember" => "se souvenir de moi",
 "Log in" => "Connexion",
 "Alternative Logins" => "Logins alternatifs",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Bonjour,<br><br>Nous vous informons que %s a partagé »%s« avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Bonjour,<br><br>Juste pour vous informer que %s a partagé <strong>%s</strong> avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
 "This means only administrators can use the instance." => "Cela signifie que uniquement les administrateurs peuvent utiliser l'instance.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contactez votre administrateur système si ce message persiste ou apparaît de façon innatendue.",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 7303807e51..c1c678e7e3 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s compartiu «%s» con vostede",
+"Expiration date is in the past." => "A data de caducidade está no pasado.",
 "Couldn't send mail to following users: %s " => "Non é posíbel enviar correo aos usuarios seguintes: %s",
 "Turned on maintenance mode" => "Modo de mantemento activado",
 "Turned off maintenance mode" => "Modo de mantemento desactivado",
 "Updated database" => "Base de datos actualizada",
-"Updating filecache, this may take really long..." => "Actualizando o ficheiro da caché, isto pode levar bastante tempo...",
-"Updated filecache" => "Ficheiro da caché actualizado",
-"... %d%% done ..." => "... %d%% feito ...",
 "No image or file provided" => "Non forneceu ningunha imaxe ou ficheiro",
 "Unknown filetype" => "Tipo de ficheiro descoñecido",
 "Invalid image" => "Imaxe incorrecta",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "novembro",
 "December" => "decembro",
 "Settings" => "Axustes",
+"Saving..." => "Gardando...",
 "seconds ago" => "segundos atrás",
 "_%n minute ago_::_%n minutes ago_" => array("hai %n minuto","hai %n minutos"),
 "_%n hour ago_::_%n hours ago_" => array("hai %n hora","hai %n horas"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(todo o seleccionado)",
 "({count} selected)" => "({count} seleccionados)",
 "Error loading file exists template" => "Produciuse un erro ao cargar o modelo de ficheiro existente",
+"Very weak password" => "Contrasinal moi feble",
+"Weak password" => "Contrasinal feble",
+"So-so password" => "Contrasinal non moi aló",
+"Good password" => "Bo contrasinal",
+"Strong password" => "Contrasinal forte",
 "Shared" => "Compartir",
 "Share" => "Compartir",
 "Error" => "Erro",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualización non foi satisfactoria, informe deste problema á  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade de ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
 "%s password reset" => "Restabelecer o contrasinal %s",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Produciuse un problema ao mesmo tempo que enviaba o correo, póñase en contacto co administrador.",
 "Use the following link to reset your password: {link}" => "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Envióuselle ao seu correo unha ligazón para restabelecer o seu contrasinal.<br>Se non o recibe nun prazo razoábel de tempo, revise o seu cartafol de correo lixo ou de non desexados.<br> Se non o atopa aí pregúntelle ao seu administrador local..",
 "Request failed!<br>Did you make sure your email/username was right?" => "Non foi posíbel facer a petición!<br>Asegúrese de que o seu enderezo de correo ou nome de usuario é correcto.",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "A páxina de conexión",
 "New password" => "Novo contrasinal",
 "Reset password" => "Restabelecer o contrasinal",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
+"For the best results, please consider using a GNU/Linux server instead." => "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
 "Personal" => "Persoal",
 "Users" => "Usuarios",
 "Apps" => "Aplicativos",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
 "Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
-"Advanced" => "Avanzado",
+"Storage & database" => "Almacenamento e base de datos",
 "Data folder" => "Cartafol de datos",
 "Configure the database" => "Configurar a base de datos",
 "will be used" => "vai ser utilizado",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "lembrar",
 "Log in" => "Conectar",
 "Alternative Logins" => "Accesos alternativos",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ola,<br><br>Só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Esta instancia do ownCloud está actualmente en modo de usuario único.",
 "This means only administrators can use the instance." => "Isto significa que só os administradores poden utilizar a instancia.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Póñase en contacto co administrador do sistema se persiste esta mensaxe ou se aparece de forma inesperada.",
diff --git a/core/l10n/he.php b/core/l10n/he.php
index c8012b5362..4579626f12 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s שיתף/שיתפה איתך את »%s«",
 "Sunday" => "יום ראשון",
 "Monday" => "יום שני",
 "Tuesday" => "יום שלישי",
@@ -21,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "נובמבר",
 "December" => "דצמבר",
 "Settings" => "הגדרות",
+"Saving..." => "שמירה…",
 "seconds ago" => "שניות",
 "_%n minute ago_::_%n minutes ago_" => array("לפני %n דקה","לפני %n דקות"),
 "_%n hour ago_::_%n hours ago_" => array("לפני %n שעה","לפני %n שעות"),
@@ -99,7 +99,6 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ללא מחולל מספרים אקראיים מאובטח תוקף יכול לנבא את מחרוזות איפוס הססמה ולהשתלט על החשבון שלך.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
 "Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
-"Advanced" => "מתקדם",
 "Data folder" => "תיקיית נתונים",
 "Configure the database" => "הגדרת מסד הנתונים",
 "will be used" => "ינוצלו",
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
index b841628f28..3fad334f70 100644
--- a/core/l10n/hi.php
+++ b/core/l10n/hi.php
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Cloud not found" => "क्लौड नहीं मिला ",
 "Security Warning" => "सुरक्षा चेतावनी ",
 "Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
-"Advanced" => "उन्नत",
 "Data folder" => "डाटा फोल्डर",
 "Configure the database" => "डेटाबेस कॉन्फ़िगर करें ",
 "will be used" => "उपयोग होगा",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index e3d157a513..46cc802df9 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "Studeni",
 "December" => "Prosinac",
 "Settings" => "Postavke",
+"Saving..." => "Spremanje...",
 "seconds ago" => "sekundi prije",
 "_%n minute ago_::_%n minutes ago_" => array("","",""),
 "_%n hour ago_::_%n hours ago_" => array("","",""),
@@ -76,7 +77,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Pristup zabranjen",
 "Cloud not found" => "Cloud nije pronađen",
 "Create an <strong>admin account</strong>" => "Stvori <strong>administratorski račun</strong>",
-"Advanced" => "Napredno",
 "Data folder" => "Mapa baze podataka",
 "Configure the database" => "Konfiguriraj bazu podataka",
 "will be used" => "će se koristiti",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index b0b5588dfc..e81991ec7a 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s megosztotta Önnel ezt:  »%s«",
 "Couldn't send mail to following users: %s " => "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
 "Turned on maintenance mode" => "A karbantartási mód bekapcsolva",
 "Turned off maintenance mode" => "A karbantartási mód kikapcsolva",
 "Updated database" => "Frissítet adatbázis",
-"Updating filecache, this may take really long..." => "A filecache frissítése folyamatban, ez a folyamat hosszabb ideig is eltarthat...",
-"Updated filecache" => "Filecache frissítve",
-"... %d%% done ..." => "... %d%% kész ...",
 "No image or file provided" => "Nincs kép vagy file megadva",
 "Unknown filetype" => "Ismeretlen file tipús",
 "Invalid image" => "Hibás kép",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "november",
 "December" => "december",
 "Settings" => "Beállítások",
+"Saving..." => "Mentés...",
 "seconds ago" => "pár másodperce",
 "_%n minute ago_::_%n minutes ago_" => array("%n perccel ezelőtt","%n perccel ezelőtt"),
 "_%n hour ago_::_%n hours ago_" => array("%n órával ezelőtt","%n órával ezelőtt"),
@@ -143,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
 "Create an <strong>admin account</strong>" => "<strong>Rendszergazdai belépés</strong> létrehozása",
-"Advanced" => "Haladó",
 "Data folder" => "Adatkönyvtár",
 "Configure the database" => "Adatbázis konfigurálása",
 "will be used" => "adatbázist fogunk használni",
@@ -166,7 +162,6 @@ $TRANSLATIONS = array(
 "remember" => "emlékezzen",
 "Log in" => "Bejelentkezés",
 "Alternative Logins" => "Alternatív bejelentkezés",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Szia!<br><br>Értesítünk, hogy %s megosztotta veled a következőt: »%s«.<br><a href=\"%s\">Ide kattintva tudod megnézni</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Az Owncloud frissítés elezdődött egy felhasználós módban.",
 "This means only administrators can use the instance." => "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példányt",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Ha ezt az üzenetet már többször látod akkor keresd meg a rendszer adminját.",
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index de929650f0..cff33a8ff9 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Accesso prohibite",
 "Cloud not found" => "Nube non trovate",
 "Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
-"Advanced" => "Avantiate",
 "Data folder" => "Dossier de datos",
 "Configure the database" => "Configurar le base de datos",
 "will be used" => "essera usate",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 2fa7ae8e3c..5038d0d6c8 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s membagikan »%s« dengan anda",
 "Couldn't send mail to following users: %s " => "Tidak dapat mengirim Email ke pengguna berikut: %s",
 "Turned on maintenance mode" => "Hidupkan mode perawatan",
 "Turned off maintenance mode" => "Matikan mode perawatan",
 "Updated database" => "Basis data terbaru",
-"Updating filecache, this may take really long..." => "Memperbarui filecache, mungkin memerlukan waktu sangat lama...",
-"Updated filecache" => "Filecache terbaru",
-"... %d%% done ..." => "... %d%% selesai ...",
 "No image or file provided" => "Tidak ada gambar atau file yang disediakan",
 "Unknown filetype" => "Tipe berkas tak dikenal",
 "Invalid image" => "Gambar tidak sah",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "Desember",
 "Settings" => "Pengaturan",
+"Saving..." => "Menyimpan...",
 "seconds ago" => "beberapa detik yang lalu",
 "_%n minute ago_::_%n minutes ago_" => array("%n menit yang lalu"),
 "_%n hour ago_::_%n hours ago_" => array("%n jam yang lalu"),
@@ -143,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
-"Advanced" => "Lanjutan",
 "Data folder" => "Folder data",
 "Configure the database" => "Konfigurasikan basis data",
 "will be used" => "akan digunakan",
@@ -166,7 +162,6 @@ $TRANSLATIONS = array(
 "remember" => "selalu masuk",
 "Log in" => "Masuk",
 "Alternative Logins" => "Cara Alternatif untuk Masuk",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hai,<br><br>hanya supaya anda tahu bahwa %s membagikan »%s« dengan anda.<br><a href=\"%s\">Lihat!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "ownCloud ini sedang dalam mode pengguna tunggal.",
 "This means only administrators can use the instance." => "Ini berarti hanya administrator yang dapat menggunakan ownCloud.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Hubungi administrator sistem anda jika pesan ini terus muncul atau muncul tiba-tiba.",
diff --git a/core/l10n/is.php b/core/l10n/is.php
index d90669ac8d..f0bb8b94ff 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "Nóvember",
 "December" => "Desember",
 "Settings" => "Stillingar",
+"Saving..." => "Er að vista ...",
 "seconds ago" => "sek.",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
@@ -90,7 +91,6 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Enginn traustur slembitölugjafi í boði, vinsamlegast virkjaðu PHP OpenSSL viðbótina.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Án öruggs slembitölugjafa er mögulegt að sjá fyrir öryggis auðkenni til að endursetja lykilorð og komast inn á aðganginn þinn.",
 "Create an <strong>admin account</strong>" => "Útbúa <strong>vefstjóra aðgang</strong>",
-"Advanced" => "Ítarlegt",
 "Data folder" => "Gagnamappa",
 "Configure the database" => "Stilla gagnagrunn",
 "will be used" => "verður notað",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 444d7ed250..2f0017263f 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s ha condiviso «%s» con te",
+"Expiration date is in the past." => "La data di scadenza è nel passato.",
 "Couldn't send mail to following users: %s " => "Impossibile inviare email ai seguenti utenti: %s",
 "Turned on maintenance mode" => "Modalità di manutenzione attivata",
 "Turned off maintenance mode" => "Modalità di manutenzione disattivata",
 "Updated database" => "Database aggiornato",
-"Updating filecache, this may take really long..." => "Aggiornamento della cache dei file in corso, potrebbe richiedere molto tempo...",
-"Updated filecache" => "Cache dei file aggiornata",
-"... %d%% done ..." => "... %d%% completato ...",
 "No image or file provided" => "Non è stata fornita alcun immagine o file",
 "Unknown filetype" => "Tipo di file sconosciuto",
 "Invalid image" => "Immagine non valida",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "Novembre",
 "December" => "Dicembre",
 "Settings" => "Impostazioni",
+"Saving..." => "Salvataggio in corso...",
 "seconds ago" => "secondi fa",
 "_%n minute ago_::_%n minutes ago_" => array("%n minuto fa","%n minuti fa"),
 "_%n hour ago_::_%n hours ago_" => array("%n ora fa","%n ore fa"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(tutti i selezionati)",
 "({count} selected)" => "({count} selezionati)",
 "Error loading file exists template" => "Errore durante il caricamento del modello del file esistente",
+"Very weak password" => "Password molto debole",
+"Weak password" => "Password debole",
+"So-so password" => "Password così-così",
+"Good password" => "Password buona",
+"Strong password" => "Password forte",
 "Shared" => "Condivisi",
 "Share" => "Condividi",
 "Error" => "Errore",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunità di ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
 "%s password reset" => "Ripristino password di %s",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Si è verificato un problema durante l'invio della email, contatta il tuo amministratore.",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Il collegamento per ripristinare la password è stato inviato al tuo indirizzo di posta.<br>Se non lo ricevi in tempi ragionevoli, controlla le cartelle della posta indesiderata.<br>Se non dovesse essere nemmeno lì, contatta il tuo amministratore locale.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome utente fosse corretto?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Alla pagina di accesso",
 "New password" => "Nuova password",
 "Reset password" => "Ripristina la password",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
+"For the best results, please consider using a GNU/Linux server instead." => "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
 "Personal" => "Personale",
 "Users" => "Utenti",
 "Apps" => "Applicazioni",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
-"Advanced" => "Avanzat",
+"Storage & database" => "Archiviazione e database",
 "Data folder" => "Cartella dati",
 "Configure the database" => "Configura il database",
 "will be used" => "sarà utilizzato",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "ricorda",
 "Log in" => "Accedi",
 "Alternative Logins" => "Accessi alternativi",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ciao,<br><br>volevo informarti che %s ha condiviso %s con te.<br><a href=\"%s\">Vedi!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ciao,<br><br>volevo informarti che %s ha condiviso <strong>%s</strong> con te.<br><a href=\"%s\">Guarda!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Questa istanza di ownCloud è in modalità utente singolo.",
 "This means only administrators can use the instance." => "Ciò significa che solo gli amministratori possono utilizzare l'istanza.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.",
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
new file mode 100644
index 0000000000..eb3e688257
--- /dev/null
+++ b/core/l10n/ja.php
@@ -0,0 +1,181 @@
+<?php
+$TRANSLATIONS = array(
+"Couldn't send mail to following users: %s " => "次のユーザーにメールを送信できませんでした: %s",
+"Turned on maintenance mode" => "メンテナンスモードがオンになりました",
+"Turned off maintenance mode" => "メンテナンスモードがオフになりました",
+"Updated database" => "データベース更新完了",
+"No image or file provided" => "画像もしくはファイルが提供されていません",
+"Unknown filetype" => "不明なファイルタイプ",
+"Invalid image" => "無効な画像",
+"No temporary profile picture available, try again" => "一時的なプロファイル用画像が利用できません。もう一度試してください",
+"No crop data provided" => "クロップデータは提供されません",
+"Sunday" => "日",
+"Monday" => "月",
+"Tuesday" => "火",
+"Wednesday" => "水",
+"Thursday" => "木",
+"Friday" => "金",
+"Saturday" => "土",
+"January" => "1月",
+"February" => "2月",
+"March" => "3月",
+"April" => "4月",
+"May" => "5月",
+"June" => "6月",
+"July" => "7月",
+"August" => "8月",
+"September" => "9月",
+"October" => "10月",
+"November" => "11月",
+"December" => "12月",
+"Settings" => "設定",
+"Saving..." => "保存中...",
+"seconds ago" => "数秒前",
+"_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
+"_%n hour ago_::_%n hours ago_" => array("%n 時間前"),
+"today" => "今日",
+"yesterday" => "昨日",
+"_%n day ago_::_%n days ago_" => array("%n日前"),
+"last month" => "1ヶ月前",
+"_%n month ago_::_%n months ago_" => array("%nヶ月前"),
+"months ago" => "数ヶ月前",
+"last year" => "1年前",
+"years ago" => "数年前",
+"Choose" => "選択",
+"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
+"Yes" => "はい",
+"No" => "いいえ",
+"Ok" => "OK",
+"Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"),
+"One file conflict" => "1ファイルが競合",
+"Which files do you want to keep?" => "どちらのファイルを保持したいですか？",
+"If you select both versions, the copied file will have a number added to its name." => "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。",
+"Cancel" => "キャンセル",
+"Continue" => "続ける",
+"(all selected)" => "(全て選択)",
+"({count} selected)" => "({count} 選択)",
+"Error loading file exists template" => "既存ファイルのテンプレートの読み込みエラー",
+"Very weak password" => "非常に弱いパスワード",
+"Weak password" => "弱いパスワード",
+"So-so password" => "まずまずのパスワード",
+"Good password" => "良好なパスワード",
+"Strong password" => "強いパスワード",
+"Shared" => "共有中",
+"Share" => "共有",
+"Error" => "エラー",
+"Error while sharing" => "共有でエラー発生",
+"Error while unsharing" => "共有解除でエラー発生",
+"Error while changing permissions" => "権限変更でエラー発生",
+"Shared with you and the group {group} by {owner}" => "あなたと {owner} のグループ {group} で共有中",
+"Shared with you by {owner}" => "{owner} と共有中",
+"Share with user or group …" => "ユーザーもしくはグループと共有 ...",
+"Share link" => "URLで共有",
+"Password protect" => "パスワード保護",
+"Password" => "パスワード",
+"Allow Public Upload" => "アップロードを許可",
+"Email link to person" => "メールリンク",
+"Send" => "送信",
+"Set expiration date" => "有効期限を設定",
+"Expiration date" => "有効期限",
+"Share via email:" => "メール経由で共有:",
+"No people found" => "ユーザーが見つかりません",
+"group" => "グループ",
+"Resharing is not allowed" => "再共有は許可されていません",
+"Shared in {item} with {user}" => "{item} 内で {user} と共有中",
+"Unshare" => "共有解除",
+"notify by email" => "メールで通知",
+"can edit" => "編集を許可",
+"access control" => "アクセス権限",
+"create" => "作成",
+"update" => "アップデート",
+"delete" => "削除",
+"share" => "共有",
+"Password protected" => "パスワード保護",
+"Error unsetting expiration date" => "有効期限の未設定エラー",
+"Error setting expiration date" => "有効期限の設定でエラー発生",
+"Sending ..." => "送信中...",
+"Email sent" => "メールを送信しました",
+"Warning" => "警告",
+"The object type is not specified." => "オブジェクトタイプが指定されていません。",
+"Enter new" => "新規に入力",
+"Delete" => "削除",
+"Add" => "追加",
+"Edit tags" => "タグを編集",
+"Error loading dialog template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
+"No tags selected for deletion." => "削除するタグが選択されていません。",
+"Please reload the page." => "ページをリロードしてください。",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "アップデートに失敗しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。",
+"The update was successful. Redirecting you to ownCloud now." => "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
+"%s password reset" => "%s パスワードリセット",
+"A problem has occurred whilst sending the email, please contact your administrator." => "メールの送信中に問題が発生しました。管理者に問い合わせください。",
+"Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックしてください: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "パスワードリセットのリンクをあなたのメールアドレスに送信しました。<br>しばらくたっても受信できない場合は、スパム／迷惑メールフォルダーを確認してください。<br>もしそこにもない場合は、管理者に問い合わせてください。",
+"Request failed!<br>Did you make sure your email/username was right?" => "リクエストに失敗しました！<br>あなたのメール／ユーザー名が正しいことを確認しましたか？",
+"You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
+"Username" => "ユーザー名",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
+"Yes, I really want to reset my password now" => "はい、今すぐパスワードをリセットします。",
+"Reset" => "リセット",
+"Your password was reset" => "あなたのパスワードはリセットされました。",
+"To login page" => "ログインページへ戻る",
+"New password" => "新しいパスワードを入力",
+"Reset password" => "パスワードをリセット",
+"Personal" => "個人",
+"Users" => "ユーザー",
+"Apps" => "アプリ",
+"Admin" => "管理",
+"Help" => "ヘルプ",
+"Error loading tags" => "タグの読み込みエラー",
+"Tag already exists" => "タグはすでに存在します",
+"Error deleting tag(s)" => "タグの削除エラー",
+"Error tagging" => "タグの付与エラー",
+"Error untagging" => "タグの解除エラー",
+"Error favoriting" => "お気に入りに追加エラー",
+"Error unfavoriting" => "お気に入りから削除エラー",
+"Access forbidden" => "アクセスが禁止されています",
+"Cloud not found" => "見つかりません",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n",
+"The share will expire on %s." => "共有は %s で有効期限が切れます。",
+"Cheers!" => "それでは！",
+"Security Warning" => "セキュリティ警告",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
+"Please update your PHP installation to use %s securely." => "%s を安全に利用するため、インストールされているPHPをアップデートしてください。",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にしてください。",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者がパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess ファイルが動作していないため、おそらくあなたのデータディレクトリもしくはファイルはインターネットからアクセス可能です。",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
+"Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
+"Storage & database" => "ストレージとデータベース",
+"Data folder" => "データフォルダー",
+"Configure the database" => "データベースを設定してください",
+"will be used" => "が使用されます",
+"Database user" => "データベースのユーザー名",
+"Database password" => "データベースのパスワード",
+"Database name" => "データベース名",
+"Database tablespace" => "データベースの表領域",
+"Database host" => "データベースのホスト名",
+"Finish setup" => "セットアップを完了します",
+"Finishing …" => "作業を完了しています ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "このアプリケーションを使用するにはJavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、インターフェースを更新してください。 ",
+"%s is available. Get more information on how to update." => "%s が利用可能です。アップデート方法について詳細情報を確認してください。",
+"Log out" => "ログアウト",
+"Automatic logon rejected!" => "自動ログインは拒否されました！",
+"If you did not change your password recently, your account may be compromised!" => "最近パスワードを変更していない場合、あなたのアカウントが危険にさらされている可能性があります!",
+"Please change your password to secure your account again." => "アカウント保護のため、パスワードを再度変更してください。",
+"Server side authentication failed!" => "サーバーサイドの認証に失敗しました！",
+"Please contact your administrator." => "管理者に問い合わせてください。",
+"Lost your password?" => "パスワードを忘れましたか？",
+"remember" => "パスワードを保存",
+"Log in" => "ログイン",
+"Alternative Logins" => "代替ログイン",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "このownCloudインスタンスは、現在シングルユーザーモードです。",
+"This means only administrators can use the instance." => "これは、管理者のみがインスタンスを利用できることを意味しています。",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に連絡してください。",
+"Thank you for your patience." => "しばらくお待ちください。",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ちください。",
+"This ownCloud instance is currently being updated, which may take a while." => "この ownCloud インスタンスは現在アップデート中のため、しばらく時間がかかります。",
+"Please reload this page after a short time to continue using ownCloud." => "ownCloud を続けて利用するには、しばらくした後でページをリロードしてください。"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index aa737a71d0..9fce579e69 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%sが あなたと »%s«を共有しました",
-"Couldn't send mail to following users: %s " => "次のユーザにメールを送信できませんでした: %s",
+"Couldn't send mail to following users: %s " => "次のユーザーにメールを送信できませんでした: %s",
 "Turned on maintenance mode" => "メンテナンスモードがオンになりました",
 "Turned off maintenance mode" => "メンテナンスモードがオフになりました",
 "Updated database" => "データベース更新完了",
@@ -11,7 +10,7 @@ $TRANSLATIONS = array(
 "No image or file provided" => "画像もしくはファイルが提供されていません",
 "Unknown filetype" => "不明なファイルタイプ",
 "Invalid image" => "無効な画像",
-"No temporary profile picture available, try again" => "一時的なプロファイル用画像が利用できません。もう一度試して下さい",
+"No temporary profile picture available, try again" => "一時的なプロファイル用画像が利用できません。もう一度試してください",
 "No crop data provided" => "クロップデータは提供されません",
 "Sunday" => "日",
 "Monday" => "月",
@@ -33,16 +32,17 @@ $TRANSLATIONS = array(
 "November" => "11月",
 "December" => "12月",
 "Settings" => "設定",
+"Saving..." => "保存中...",
 "seconds ago" => "数秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
 "_%n hour ago_::_%n hours ago_" => array("%n 時間前"),
 "today" => "今日",
 "yesterday" => "昨日",
-"_%n day ago_::_%n days ago_" => array("%n 日前"),
-"last month" => "一月前",
-"_%n month ago_::_%n months ago_" => array("%n ヶ月前"),
+"_%n day ago_::_%n days ago_" => array("%n日前"),
+"last month" => "1ヶ月前",
+"_%n month ago_::_%n months ago_" => array("%nヶ月前"),
 "months ago" => "数ヶ月前",
-"last year" => "一年前",
+"last year" => "1年前",
 "years ago" => "数年前",
 "Choose" => "選択",
 "Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
@@ -59,6 +59,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(全て選択)",
 "({count} selected)" => "({count} 選択)",
 "Error loading file exists template" => "既存ファイルのテンプレートの読み込みエラー",
+"Very weak password" => "非常に弱いパスワード",
+"Weak password" => "弱いパスワード",
+"So-so password" => "まずまずのパスワード",
+"Good password" => "良好なパスワード",
+"Strong password" => "強いパスワード",
 "Shared" => "共有中",
 "Share" => "共有",
 "Error" => "エラー",
@@ -67,7 +72,7 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "権限変更でエラー発生",
 "Shared with you and the group {group} by {owner}" => "あなたと {owner} のグループ {group} で共有中",
 "Shared with you by {owner}" => "{owner} と共有中",
-"Share with user or group …" => "ユーザもしくはグループと共有 ...",
+"Share with user or group …" => "ユーザーもしくはグループと共有 ...",
 "Share link" => "URLで共有",
 "Password protect" => "パスワード保護",
 "Password" => "パスワード",
@@ -86,7 +91,7 @@ $TRANSLATIONS = array(
 "can edit" => "編集を許可",
 "access control" => "アクセス権限",
 "create" => "作成",
-"update" => "更新",
+"update" => "アップデート",
 "delete" => "削除",
 "share" => "共有",
 "Password protected" => "パスワード保護",
@@ -95,7 +100,7 @@ $TRANSLATIONS = array(
 "Sending ..." => "送信中...",
 "Email sent" => "メールを送信しました",
 "Warning" => "警告",
-"The object type is not specified." => "オブジェクタイプが指定されていません。",
+"The object type is not specified." => "オブジェクトタイプが指定されていません。",
 "Enter new" => "新規に入力",
 "Delete" => "削除",
 "Add" => "追加",
@@ -103,15 +108,16 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
 "No tags selected for deletion." => "削除するタグが選択されていません。",
 "Please reload the page." => "ページをリロードしてください。",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新に成功しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。",
-"The update was successful. Redirecting you to ownCloud now." => "更新に成功しました。今すぐownCloudにリダイレクトします。",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "アップデートに失敗しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。",
+"The update was successful. Redirecting you to ownCloud now." => "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
 "%s password reset" => "%s パスワードリセット",
-"Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックして下さい: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "パスワードリセットのリンクをあなたのメールアドレスに送信しました。<br>しばらくたっても受信出来ない場合は、スパム／迷惑メールフォルダを確認して下さい。<br>もしそこにもない場合は、管理者に問い合わせてください。",
-"Request failed!<br>Did you make sure your email/username was right?" => "リクエストに失敗しました！<br>あなたのメール／ユーザ名が正しいことを確認しましたか？",
+"A problem has occurred whilst sending the email, please contact your administrator." => "メールの送信中に問題が発生しました。管理者に問い合わせください。",
+"Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックしてください: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "パスワードリセットのリンクをあなたのメールアドレスに送信しました。<br>しばらくたっても受信できない場合は、スパム／迷惑メールフォルダーを確認してください。<br>もしそこにもない場合は、管理者に問い合わせてください。",
+"Request failed!<br>Did you make sure your email/username was right?" => "リクエストに失敗しました！<br>あなたのメール／ユーザー名が正しいことを確認しましたか？",
 "You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
 "Username" => "ユーザー名",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "ファイルが暗号化されています。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
 "Yes, I really want to reset my password now" => "はい、今すぐパスワードをリセットします。",
 "Reset" => "リセット",
 "Your password was reset" => "あなたのパスワードはリセットされました。",
@@ -119,7 +125,7 @@ $TRANSLATIONS = array(
 "New password" => "新しいパスワードを入力",
 "Reset password" => "パスワードをリセット",
 "Personal" => "個人",
-"Users" => "ユーザ",
+"Users" => "ユーザー",
 "Apps" => "アプリ",
 "Admin" => "管理",
 "Help" => "ヘルプ",
@@ -137,42 +143,42 @@ $TRANSLATIONS = array(
 "Cheers!" => "それでは！",
 "Security Warning" => "セキュリティ警告",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
-"Please update your PHP installation to use %s securely." => "%s を安全に利用する為に インストールされているPHPをアップデートしてください。",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。",
+"Please update your PHP installation to use %s securely." => "%s を安全に利用するため、インストールされているPHPをアップデートしてください。",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にしてください。",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "セキュアな乱数生成器が無い場合、攻撃者がパスワードリセットのトークンを予測してアカウントを乗っ取られる可能性があります。",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess ファイルが動作していないため、おそらくあなたのデータディレクトリもしくはファイルはインターネットからアクセス可能です。",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
 "Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
-"Advanced" => "詳細設定",
-"Data folder" => "データフォルダ",
+"Storage & database" => "ストレージとデータベース",
+"Data folder" => "データフォルダー",
 "Configure the database" => "データベースを設定してください",
 "will be used" => "が使用されます",
-"Database user" => "データベースのユーザ名",
+"Database user" => "データベースのユーザー名",
 "Database password" => "データベースのパスワード",
 "Database name" => "データベース名",
 "Database tablespace" => "データベースの表領域",
 "Database host" => "データベースのホスト名",
 "Finish setup" => "セットアップを完了します",
-"Finishing …" => "終了しています ...",
-"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "このアプリケーションは使用する為、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、インターフェースを更新してください。 ",
-"%s is available. Get more information on how to update." => "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。",
+"Finishing …" => "作業を完了しています ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "このアプリケーションを使用するにはJavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、インターフェースを更新してください。 ",
+"%s is available. Get more information on how to update." => "%s が利用可能です。アップデート方法について詳細情報を確認してください。",
 "Log out" => "ログアウト",
 "Automatic logon rejected!" => "自動ログインは拒否されました！",
-"If you did not change your password recently, your account may be compromised!" => "最近パスワードを変更していない場合、あなたのアカウントは危険にさらされているかもしれません。",
-"Please change your password to secure your account again." => "アカウント保護の為、パスワードを再度の変更をお願いいたします。",
-"Server side authentication failed!" => "サーバサイドの認証に失敗しました！",
+"If you did not change your password recently, your account may be compromised!" => "最近パスワードを変更していない場合、あなたのアカウントが危険にさらされている可能性があります!",
+"Please change your password to secure your account again." => "アカウント保護のため、パスワードを再度変更してください。",
+"Server side authentication failed!" => "サーバーサイドの認証に失敗しました！",
 "Please contact your administrator." => "管理者に問い合わせてください。",
 "Lost your password?" => "パスワードを忘れましたか？",
-"remember" => "自動ログインする",
+"remember" => "パスワードを保存",
 "Log in" => "ログイン",
 "Alternative Logins" => "代替ログイン",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "この ownCloud インスタンスは、現在シングルユーザモードです。",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "このownCloudインスタンスは、現在シングルユーザーモードです。",
 "This means only administrators can use the instance." => "これは、管理者のみがインスタンスを利用できることを意味しています。",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に連絡してください。",
 "Thank you for your patience." => "しばらくお待ちください。",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。",
-"This ownCloud instance is currently being updated, which may take a while." => "この ownCloud インスタンスは現在更新中であり、しばらく時間がかかります。",
+"Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ちください。",
+"This ownCloud instance is currently being updated, which may take a while." => "この ownCloud インスタンスは現在アップデート中のため、しばらく時間がかかります。",
 "Please reload this page after a short time to continue using ownCloud." => "ownCloud を続けて利用するには、しばらくした後でページをリロードしてください。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index 38f4f9536d..0070fd7994 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "ნოემბერი",
 "December" => "დეკემბერი",
 "Settings" => "პარამეტრები",
+"Saving..." => "შენახვა...",
 "seconds ago" => "წამის წინ",
 "_%n minute ago_::_%n minutes ago_" => array(""),
 "_%n hour ago_::_%n hours ago_" => array(""),
@@ -94,7 +95,6 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "შემთხვევითი სიმბოლოების გენერატორის გარეშე, შემტევმა შეიძლება ამოიცნოს თქვენი პაროლი შეგიცვალოთ ის და დაეუფლოს თქვენს ექაუნთს.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
 "Create an <strong>admin account</strong>" => "შექმენი <strong>ადმინ ექაუნტი</strong>",
-"Advanced" => "დამატებითი ფუნქციები",
 "Data folder" => "მონაცემთა საქაღალდე",
 "Configure the database" => "მონაცემთა ბაზის კონფიგურირება",
 "will be used" => "გამოყენებული იქნება",
diff --git a/core/l10n/km.php b/core/l10n/km.php
index 86faa16f73..f6de962a9c 100644
--- a/core/l10n/km.php
+++ b/core/l10n/km.php
@@ -1,10 +1,89 @@
 <?php
 $TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"_%n day ago_::_%n days ago_" => array(""),
-"_%n month ago_::_%n months ago_" => array(""),
+"Unknown filetype" => "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
+"Invalid image" => "រូបភាព​មិន​ត្រឹម​ត្រូវ",
+"Sunday" => "ថ្ងៃអាទិត្យ",
+"Monday" => "ថ្ងៃចន្ទ",
+"Tuesday" => "ថ្ងៃអង្គារ",
+"Wednesday" => "ថ្ងៃពុធ",
+"Thursday" => "ថ្ងៃព្រហស្បតិ៍",
+"Friday" => "ថ្ងៃសុក្រ",
+"Saturday" => "ថ្ងៃសៅរ៍",
+"January" => "ខែមករា",
+"February" => "ខែកុម្ភៈ",
+"March" => "ខែមីនា",
+"April" => "ខែមេសា",
+"May" => "ខែឧសភា",
+"June" => "ខែមិថុនា",
+"July" => "ខែកក្កដា",
+"August" => "ខែសីហា",
+"September" => "ខែកញ្ញា",
+"October" => "ខែតុលា",
+"November" => "ខែវិច្ឆិកា",
+"December" => "ខែធ្នូ",
+"Settings" => "ការកំណត់",
+"Saving..." => "កំពុង​រក្សាទុក",
+"seconds ago" => "វិនាទី​មុន",
+"_%n minute ago_::_%n minutes ago_" => array("%n នាទី​មុន"),
+"_%n hour ago_::_%n hours ago_" => array("%n ម៉ោង​មុន"),
+"today" => "ថ្ងៃនេះ",
+"yesterday" => "ម្សិលមិញ",
+"_%n day ago_::_%n days ago_" => array("%n ថ្ងៃ​មុន"),
+"last month" => "ខែមុន",
+"_%n month ago_::_%n months ago_" => array("%n ខែ​មុន"),
+"months ago" => "ខែ​មុន",
+"last year" => "ឆ្នាំ​មុន",
+"years ago" => "ឆ្នាំ​មុន",
+"Choose" => "ជ្រើស",
+"Yes" => "ព្រម",
+"No" => "ទេ",
+"Ok" => "ព្រម",
 "_{count} file conflict_::_{count} file conflicts_" => array(""),
-"Delete" => "លុប"
+"Cancel" => "លើកលែង",
+"Shared" => "បាន​ចែក​រំលែក",
+"Share" => "ចែក​រំលែក",
+"Error" => "កំហុស",
+"Error while sharing" => "កំហុស​ពេល​ចែក​រំលែក",
+"Error while unsharing" => "កំពុង​ពេល​លែង​ចែក​រំលែក",
+"Error while changing permissions" => "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
+"Shared with you and the group {group} by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
+"Shared with you by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
+"Password protect" => "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+"Password" => "ពាក្យសម្ងាត់",
+"Send" => "ផ្ញើ",
+"Set expiration date" => "កំណត់​ពេល​ផុត​កំណត់",
+"Expiration date" => "ពេល​ផុត​កំណត់",
+"Share via email:" => "ចែក​រំលែក​តាម​អ៊ីមែល៖",
+"No people found" => "រក​មិន​ឃើញ​មនុស្ស​ណា​ម្នាក់",
+"group" => "ក្រុម",
+"Resharing is not allowed" => "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ",
+"Shared in {item} with {user}" => "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}",
+"Unshare" => "លែង​ចែក​រំលែក",
+"can edit" => "អាច​កែប្រែ",
+"access control" => "សិទ្ធិ​បញ្ជា",
+"create" => "បង្កើត",
+"update" => "ធ្វើ​បច្ចុប្បន្នភាព",
+"delete" => "លុប",
+"share" => "ចែក​រំលែក",
+"Password protected" => "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+"Sending ..." => "កំពុង​ផ្ញើ ...",
+"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
+"Warning" => "បម្រាម",
+"The object type is not specified." => "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
+"Delete" => "លុប",
+"Add" => "បញ្ចូល",
+"Username" => "ឈ្មោះ​អ្នកប្រើ",
+"Your password was reset" => "ពាក្យ​សម្ងាត់​របស់​អ្នក​ត្រូវ​បាន​កំណត់​ឡើង​វិញ",
+"To login page" => "ទៅ​ទំព័រ​ចូល",
+"New password" => "ពាក្យ​សម្ងាត់​ថ្មី",
+"Reset password" => "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
+"Personal" => "ផ្ទាល់​ខ្លួន",
+"Users" => "អ្នកប្រើ",
+"Apps" => "កម្មវិធី",
+"Admin" => "អ្នក​គ្រប់​គ្រង",
+"Help" => "ជំនួយ",
+"Access forbidden" => "បាន​ហាមឃាត់​ការ​ចូល",
+"Cloud not found" => "រក​មិន​ឃើញ Cloud",
+"Security Warning" => "បម្រាម​សុវត្ថិភាព"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index dc7cb8d3e7..6020777f87 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s 님이 %s을(를) 공유하였습니다",
 "Couldn't send mail to following users: %s " => "%s 님에게 메일을 보낼 수 없습니다.",
 "Turned on maintenance mode" => "유지 보수 모드 켜짐",
 "Turned off maintenance mode" => "유지 보수 모드 꺼짐",
 "Updated database" => "데이터베이스 업데이트 됨",
-"Updating filecache, this may take really long..." => "파일 캐시 업데이트 중, 시간이 약간 걸릴 수 있습니다...",
-"Updated filecache" => "파일 캐시 업데이트 됨",
-"... %d%% done ..." => "... %d%% 완료됨 ...",
 "No image or file provided" => "이미지나 파일이 없음",
 "Unknown filetype" => "알려지지 않은 파일 형식",
 "Invalid image" => "잘못된 이미지",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "11월",
 "December" => "12월",
 "Settings" => "설정",
+"Saving..." => "저장 중...",
 "seconds ago" => "초 전",
 "_%n minute ago_::_%n minutes ago_" => array("%n분 전 "),
 "_%n hour ago_::_%n hours ago_" => array("%n시간 전 "),
@@ -59,6 +56,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(모두 선택됨)",
 "({count} selected)" => "({count}개 선택됨)",
 "Error loading file exists template" => "파일 존재함 템플릿을 불러오는 중 오류 발생",
+"Very weak password" => "매우 약한 암호",
+"Weak password" => "약한 암호",
+"So-so password" => "그저 그런 암호",
+"Good password" => "좋은 암호",
+"Strong password" => "강력한 암호",
 "Shared" => "공유됨",
 "Share" => "공유",
 "Error" => "오류",
@@ -143,7 +145,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
 "Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong> 만들기",
-"Advanced" => "고급",
+"Storage & database" => "스토리지 & 데이터베이스",
 "Data folder" => "데이터 폴더",
 "Configure the database" => "데이터베이스 설정",
 "will be used" => "사용될 예정",
@@ -166,7 +168,6 @@ $TRANSLATIONS = array(
 "remember" => "기억하기",
 "Log in" => "로그인",
 "Alternative Logins" => "대체 로그인",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "안녕하세요,<br><br>%s 님이 %s을(를) 공유하였음을 알려 드립니다.<br><a href=\"%s\">지금 보기!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "ownCloud 인스턴스가 현재 단일 사용자 모드로 동작 중입니다.",
 "This means only administrators can use the instance." => "현재 시스템 관리자만 인스턴스를 사용할 수 있습니다.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "이 메시지가 계속 표시되거나, 예상하지 못하였을 때 표시된다면 시스템 관리자에게 연락하십시오",
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
index b809c64317..781018d4ab 100644
--- a/core/l10n/ku_IQ.php
+++ b/core/l10n/ku_IQ.php
@@ -1,11 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Settings" => "ده‌ستكاری",
+"Saving..." => "پاشکه‌وتده‌کات...",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
 "_%n day ago_::_%n days ago_" => array("",""),
 "_%n month ago_::_%n months ago_" => array("",""),
+"Yes" => "بەڵێ",
+"No" => "نەخێر",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Cancel" => "لابردن",
 "Share" => "هاوبەشی کردن",
 "Error" => "هه‌ڵه",
 "Password" => "وشەی تێپەربو",
@@ -19,7 +23,6 @@ $TRANSLATIONS = array(
 "Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
 "Help" => "یارمەتی",
 "Cloud not found" => "هیچ نه‌دۆزرایه‌وه‌",
-"Advanced" => "هه‌ڵبژاردنی پیشكه‌وتوو",
 "Data folder" => "زانیاری فۆڵده‌ر",
 "Database user" => "به‌كارهێنه‌ری داتابه‌یس",
 "Database password" => "وشه‌ی نهێنی داتا به‌یس",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 920e109bc6..b60f6c7c5f 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -1,12 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "Den/D' %s huet »%s« mat dir gedeelt",
 "Turned on maintenance mode" => "Maintenance Modus ass un",
 "Turned off maintenance mode" => "Maintenance Modus ass aus",
 "Updated database" => "Datebank ass geupdate ginn",
-"Updating filecache, this may take really long..." => "De Fichier Cache gëtt geupdate, des ka laang daueren...",
-"Updated filecache" => "De Fichier Cache ass geupdate ginn",
-"... %d%% done ..." => "... %d%% fäerdeg ...",
 "No image or file provided" => "Kee Bild oder Fichier uginn",
 "Unknown filetype" => "Onbekannten Fichier Typ",
 "Invalid image" => "Ongülteg d'Bild",
@@ -30,6 +26,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "Dezember",
 "Settings" => "Astellungen",
+"Saving..." => "Speicheren...",
 "seconds ago" => "Sekonnen hir",
 "_%n minute ago_::_%n minutes ago_" => array("%n Minutt hir","%n Minutten hir"),
 "_%n hour ago_::_%n hours ago_" => array("",""),
@@ -123,7 +120,6 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ouni e sécheren Zoufallsgenerator kann en Ugräifer d'Passwuert-Zrécksetzungs-Schlësselen viraussoen an en Account iwwerhuelen.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
 "Create an <strong>admin account</strong>" => "En <strong>Admin-Account</strong> uleeën",
-"Advanced" => "Avancéiert",
 "Data folder" => "Daten-Dossier",
 "Configure the database" => "D'Datebank konfiguréieren",
 "will be used" => "wärt benotzt ginn",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 02852e37d4..776cde74fe 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s pasidalino »%s« su tavimi",
 "Couldn't send mail to following users: %s " => "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ",
 "Turned on maintenance mode" => "Įjungta priežiūros veiksena",
 "Turned off maintenance mode" => "Išjungta priežiūros veiksena",
 "Updated database" => "Atnaujinta duomenų bazė",
-"Updating filecache, this may take really long..." => "Atnaujinama failų talpykla, tai gali užtrukti labai ilgai...",
-"Updated filecache" => "Atnaujinta failų talpykla",
-"... %d%% done ..." => "... %d%% atlikta ...",
 "No image or file provided" => "Nenurodytas paveikslėlis ar failas",
 "Unknown filetype" => "Nežinomas failo tipas",
 "Invalid image" => "Netinkamas paveikslėlis",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "Lapkritis",
 "December" => "Gruodis",
 "Settings" => "Nustatymai",
+"Saving..." => "Saugoma...",
 "seconds ago" => "prieš sekundę",
 "_%n minute ago_::_%n minutes ago_" => array(" prieš %n minutę"," prieš %n minučių"," prieš %n minučių"),
 "_%n hour ago_::_%n hours ago_" => array("prieš %n valandą","prieš %n valandų","prieš %n valandų"),
@@ -102,6 +99,7 @@ $TRANSLATIONS = array(
 "Edit tags" => "Redaguoti žymes",
 "Error loading dialog template: {error}" => "Klaida įkeliant dialogo ruošinį: {error}",
 "No tags selected for deletion." => "Trynimui nepasirinkta jokia žymė.",
+"Please reload the page." => "Prašome perkrauti puslapį.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud bendruomenei</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
 "%s password reset" => "%s slaptažodžio atnaujinimas",
@@ -112,6 +110,7 @@ $TRANSLATIONS = array(
 "Username" => "Prisijungimo vardas",
 "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
 "Yes, I really want to reset my password now" => "Taip, aš tikrai noriu atnaujinti slaptažodį",
+"Reset" => "Atstatyti",
 "Your password was reset" => "Jūsų slaptažodis buvo nustatytas iš naujo",
 "To login page" => "Į prisijungimo puslapį",
 "New password" => "Naujas slaptažodis",
@@ -126,9 +125,12 @@ $TRANSLATIONS = array(
 "Error deleting tag(s)" => "Klaida trinant žymę(-es)",
 "Error tagging" => "Klaida pridedant žymę",
 "Error untagging" => "Klaida šalinant žymę",
+"Error favoriting" => "Klaida įtraukiant į mėgstamus.",
+"Error unfavoriting" => "Klaida pašalinant iš mėgstamų.",
 "Access forbidden" => "Priėjimas draudžiamas",
 "Cloud not found" => "Negalima rasti",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
+"The share will expire on %s." => "Bendrinimo laikas baigsis %s.",
 "Cheers!" => "Sveikinimai!",
 "Security Warning" => "Saugumo pranešimas",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
@@ -138,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
-"Advanced" => "Išplėstiniai",
 "Data folder" => "Duomenų katalogas",
 "Configure the database" => "Nustatyti duomenų bazę",
 "will be used" => "bus naudojama",
@@ -149,6 +150,7 @@ $TRANSLATIONS = array(
 "Database host" => "Duomenų bazės serveris",
 "Finish setup" => "Baigti diegimą",
 "Finishing …" => "Baigiama ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Šiai programai reikia įjungti  JavaScript, kad ji veiktų tvarkingai.  Prašome <a href=\"http://enable-javascript.com/\" target=\"_blank\">įjungti JavaScript</a> ir perkrauti šią sąsają.",
 "%s is available. Get more information on how to update." => "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.",
 "Log out" => "Atsijungti",
 "Automatic logon rejected!" => "Automatinis prisijungimas atmestas!",
@@ -160,7 +162,8 @@ $TRANSLATIONS = array(
 "remember" => "prisiminti",
 "Log in" => "Prisijungti",
 "Alternative Logins" => "Alternatyvūs prisijungimai",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>",
+"This ownCloud instance is currently in single user mode." => "Ši ownCloud sistema yra vieno naudotojo veiksenoje.",
+"This means only administrators can use the instance." => "Tai reiškia, kad tik administratorius gali naudotis sistema.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Susisiekite su savo sistemos administratoriumi jei šis pranešimas nedingsta arba jei jis pasirodė netikėtai.",
 "Thank you for your patience." => "Dėkojame už jūsų kantrumą.",
 "Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti.",
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index ed0d1d1ac4..505bf46b4c 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s kopīgots »%s« ar jums",
 "Sunday" => "Svētdiena",
 "Monday" => "Pirmdiena",
 "Tuesday" => "Otrdiena",
@@ -21,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "Novembris",
 "December" => "Decembris",
 "Settings" => "Iestatījumi",
+"Saving..." => "Saglabā...",
 "seconds ago" => "sekundes atpakaļ",
 "_%n minute ago_::_%n minutes ago_" => array("Tagad, %n minūtes","Pirms %n minūtes","Pirms %n minūtēm"),
 "_%n hour ago_::_%n hours ago_" => array("Šodien, %n stundas","Pirms %n stundas","Pirms %n stundām"),
@@ -103,7 +103,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
 "Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>",
-"Advanced" => "Paplašināti",
 "Data folder" => "Datu mape",
 "Configure the database" => "Konfigurēt datubāzi",
 "will be used" => "tiks izmantots",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 7ec7fe8b75..c56ae32bf2 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -3,7 +3,6 @@ $TRANSLATIONS = array(
 "Turned on maintenance mode" => "Вклучен е модот за одржување",
 "Turned off maintenance mode" => "Ислкучен е модот за одржување",
 "Updated database" => "Базата е надградена",
-"Updated filecache" => "Кешот е надграден",
 "No image or file provided" => "Не е доставена фотографија или датотека",
 "Unknown filetype" => "Непознат тип на датотека",
 "Invalid image" => "Невалидна фотографија",
@@ -27,6 +26,7 @@ $TRANSLATIONS = array(
 "November" => "Ноември",
 "December" => "Декември",
 "Settings" => "Подесувања",
+"Saving..." => "Снимам...",
 "seconds ago" => "пред секунди",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
@@ -122,7 +122,6 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без сигурен генератор на случајни броеви напаѓач може да ги предвиди жетоните за ресетирање на лозинка и да преземе контрола врз Вашата сметка. ",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
 "Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
-"Advanced" => "Напредно",
 "Data folder" => "Фолдер со податоци",
 "Configure the database" => "Конфигурирај ја базата",
 "will be used" => "ќе биде користено",
diff --git a/core/l10n/ml.php b/core/l10n/ml.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/ml.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/mn.php b/core/l10n/mn.php
new file mode 100644
index 0000000000..ffcdde48d4
--- /dev/null
+++ b/core/l10n/mn.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index c0a50be4f2..63355191b6 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "Disember",
 "Settings" => "Tetapan",
+"Saving..." => "Simpan...",
 "_%n minute ago_::_%n minutes ago_" => array(""),
 "_%n hour ago_::_%n hours ago_" => array(""),
 "_%n day ago_::_%n days ago_" => array(""),
@@ -51,7 +52,6 @@ $TRANSLATIONS = array(
 "Cloud not found" => "Awan tidak dijumpai",
 "Security Warning" => "Amaran keselamatan",
 "Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
-"Advanced" => "Maju",
 "Data folder" => "Fail data",
 "Configure the database" => "Konfigurasi pangkalan data",
 "will be used" => "akan digunakan",
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
index 464e52d6d1..4ccf19b186 100644
--- a/core/l10n/my_MM.php
+++ b/core/l10n/my_MM.php
@@ -51,7 +51,6 @@ $TRANSLATIONS = array(
 "Cloud not found" => "မတွေ့ရှိမိပါ",
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
-"Advanced" => "အဆင့်မြင့်",
 "Data folder" => "အချက်အလက်ဖိုလ်ဒါလ်",
 "Database user" => "Database သုံးစွဲသူ",
 "Database password" => "Database စကားဝှက်",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index ad682e46ff..43141bc431 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -1,8 +1,14 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s delte »%s« med deg",
+"Couldn't send mail to following users: %s " => "Klarte ikke å sende mail til følgende brukere: %s",
+"Turned on maintenance mode" => "Slo på vedlikeholdsmodus",
+"Turned off maintenance mode" => "Slo av vedlikeholdsmodus",
+"Updated database" => "Oppdaterte databasen",
+"No image or file provided" => "Bilde eller fil ikke angitt",
 "Unknown filetype" => "Ukjent filtype",
 "Invalid image" => "Ugyldig bilde",
+"No temporary profile picture available, try again" => "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen",
+"No crop data provided" => "Ingen beskjæringsinformasjon angitt",
 "Sunday" => "Søndag",
 "Monday" => "Mandag",
 "Tuesday" => "Tirsdag",
@@ -23,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "Desember",
 "Settings" => "Innstillinger",
+"Saving..." => "Lagrer...",
 "seconds ago" => "sekunder siden",
 "_%n minute ago_::_%n minutes ago_" => array("%n minutt siden","%n minutter siden"),
 "_%n hour ago_::_%n hours ago_" => array("%n time siden","%n timer siden"),
@@ -32,29 +39,47 @@ $TRANSLATIONS = array(
 "last month" => "forrige måned",
 "_%n month ago_::_%n months ago_" => array("%n dag siden","%n dager siden"),
 "months ago" => "måneder siden",
-"last year" => "forrige år",
+"last year" => "i fjor",
 "years ago" => "år siden",
 "Choose" => "Velg",
+"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
 "Yes" => "Ja",
 "No" => "Nei",
 "Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Error loading message template: {error}" => "Feil ved lasting av meldingsmal: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
+"One file conflict" => "En filkonflikt",
+"Which files do you want to keep?" => "Hvilke filer vil du beholde?",
+"If you select both versions, the copied file will have a number added to its name." => "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet.",
 "Cancel" => "Avbryt",
 "Continue" => "Fortsett",
+"(all selected)" => "(alle valgt)",
+"({count} selected)" => "({count} valgt)",
+"Error loading file exists template" => "Feil ved lasting av \"filen eksisterer\"-mal",
 "Shared" => "Delt",
 "Share" => "Del",
 "Error" => "Feil",
 "Error while sharing" => "Feil under deling",
+"Error while unsharing" => "Feil ved oppheving av deling",
+"Error while changing permissions" => "Feil ved endring av tillatelser",
+"Shared with you and the group {group} by {owner}" => "Delt med deg og gruppen {group} av {owner}",
 "Shared with you by {owner}" => "Delt med deg av {owner}",
+"Share with user or group …" => "Del med bruker eller gruppe …",
+"Share link" => "Del lenke",
 "Password protect" => "Passordbeskyttet",
 "Password" => "Passord",
+"Allow Public Upload" => "Tillat Offentlig Opplasting",
+"Email link to person" => "Email lenke til person",
 "Send" => "Send",
 "Set expiration date" => "Set utløpsdato",
 "Expiration date" => "Utløpsdato",
 "Share via email:" => "Del på epost",
 "No people found" => "Ingen personer funnet",
 "group" => "gruppe",
+"Resharing is not allowed" => "Videredeling er ikke tillatt",
+"Shared in {item} with {user}" => "Delt i {item} med {user}",
 "Unshare" => "Avslutt deling",
+"notify by email" => "Varsle på email",
 "can edit" => "kan endre",
 "access control" => "tilgangskontroll",
 "create" => "opprett",
@@ -62,15 +87,30 @@ $TRANSLATIONS = array(
 "delete" => "slett",
 "share" => "del",
 "Password protected" => "Passordbeskyttet",
+"Error unsetting expiration date" => "Feil ved nullstilling av utløpsdato",
 "Error setting expiration date" => "Kan ikke sette utløpsdato",
 "Sending ..." => "Sender...",
 "Email sent" => "E-post sendt",
 "Warning" => "Advarsel",
+"The object type is not specified." => "Objekttypen er ikke spesifisert.",
+"Enter new" => "Oppgi ny",
 "Delete" => "Slett",
 "Add" => "Legg til",
+"Edit tags" => "Rediger merkelapper",
+"Error loading dialog template: {error}" => "Feil ved lasting av dialogmal: {error}",
+"No tags selected for deletion." => "Ingen merkelapper valgt for sletting.",
+"Please reload the page." => "Vennligst last siden på nytt.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Oppdateringen mislyktes. Vennligst rapporter dette problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud.",
+"%s password reset" => "%s nullstilling av passord",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Lenken for nullstilling av passordet ditt er sendt til din email.<br>Hvis du ikke mottar den innen rimelig tid, sjekk spam- og søppelmappene i epost-programmet.<br>Hvis den ikke er der, kontakt din lokale administrator .",
+"Request failed!<br>Did you make sure your email/username was right?" => "Anmodning feilet!<br>Forsikret du deg om at din email/brukernavn var korrekt?",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
 "Username" => "Brukernavn",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er nullstilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
+"Yes, I really want to reset my password now" => "Ja, jeg vil virkelig nullstille passordet mitt nå",
+"Reset" => "Nullstill",
 "Your password was reset" => "Passordet ditt ble tilbakestilt",
 "To login page" => "Til innlogginssiden",
 "New password" => "Nytt passord",
@@ -80,11 +120,26 @@ $TRANSLATIONS = array(
 "Apps" => "Apper",
 "Admin" => "Admin",
 "Help" => "Hjelp",
+"Error loading tags" => "Feil ved lasting av merkelapper",
+"Tag already exists" => "Merkelappen finnes allerede",
+"Error deleting tag(s)" => "Feil ved sletting av merkelapp(er)",
+"Error tagging" => "Feil ved merking",
+"Error untagging" => "Feil ved fjerning av merkelapp",
+"Error favoriting" => "Feil ved favorittmerking",
+"Error unfavoriting" => "Feil ved fjerning av favorittmerking",
 "Access forbidden" => "Tilgang nektet",
 "Cloud not found" => "Sky ikke funnet",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei der,\n\nbare informerer om at %s delte %s med deg.\nVis den: %s\n\n",
+"The share will expire on %s." => "Delingen vil opphøre %s.",
+"Cheers!" => "Ha det!",
 "Security Warning" => "Sikkerhetsadvarsel",
+"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-versjonen din er sårbar for NULL Byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Vennligst oppdater PHP-installasjonen din for å bruke %s på en sikker måte.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen sikker slumptallsgenerator er tilgjengelig. Vennligst aktiver PHP OpenSSL-utvidelsen.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Uten en sikker slumptallsgenerator er det mulig at en angriper kan forutse passordnullstilling-tokens og ta over kontoen din.",
+"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
 "Create an <strong>admin account</strong>" => "opprett en <strong>administrator-konto</strong>",
-"Advanced" => "Avansert",
 "Data folder" => "Datamappe",
 "Configure the database" => "Konfigurer databasen",
 "will be used" => "vil bli brukt",
@@ -95,13 +150,24 @@ $TRANSLATIONS = array(
 "Database host" => "Databasevert",
 "Finish setup" => "Fullfør oppsetting",
 "Finishing …" => "Ferdigstiller ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Denne applikasjonen trenger JavaScript for å fungere korrekt.  Vennligst <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiver JavaScript</a> og last dette grensesnittet på nytt.",
+"%s is available. Get more information on how to update." => "%s er tilgjengelig. Få mer informasjon om hvordan du kan oppdatere.",
 "Log out" => "Logg ut",
 "Automatic logon rejected!" => "Automatisk pålogging avvist!",
 "If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert",
 "Please change your password to secure your account again." => "Vennligst skift passord for å gjøre kontoen din sikker igjen.",
+"Server side authentication failed!" => "Autentisering feilet på serveren!",
+"Please contact your administrator." => "Vennligst kontakt administratoren din.",
 "Lost your password?" => "Mistet passordet ditt?",
 "remember" => "husk",
 "Log in" => "Logg inn",
-"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund."
+"Alternative Logins" => "Alternative innlogginger",
+"This ownCloud instance is currently in single user mode." => "Denne ownCloud-instansen er for øyeblikket i enbrukermodus.",
+"This means only administrators can use the instance." => "Dette betyr at kun administratorer kan bruke instansen.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.",
+"Thank you for your patience." => "Takk for din tålmodighet.",
+"Updating ownCloud to version %s, this may take a while." => "Oppdaterer ownCloud til versjon %s, dette kan ta en stund.",
+"This ownCloud instance is currently being updated, which may take a while." => "Denne ownCloud-instansen oppdateres for øyeblikket, noe som kan ta litt tid.",
+"Please reload this page after a short time to continue using ownCloud." => "Vennligst last denne siden på nytt om en liten stund for å fortsette å bruke ownCloud."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 3c41301060..05cef6afd5 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s deelde »%s« met jou",
+"Expiration date is in the past." => "De vervaldatum ligt in het verleden.",
 "Couldn't send mail to following users: %s " => "Kon geen e-mail sturen aan de volgende gebruikers: %s",
 "Turned on maintenance mode" => "Onderhoudsmodus ingeschakeld",
 "Turned off maintenance mode" => "Onderhoudsmodus uitgeschakeld",
 "Updated database" => "Database bijgewerkt",
-"Updating filecache, this may take really long..." => "Bijwerken bestandscache. Dit kan even duren...",
-"Updated filecache" => "Bestandscache bijgewerkt",
-"... %d%% done ..." => "... %d%% gereed ...",
 "No image or file provided" => "Geen afbeelding of bestand opgegeven",
 "Unknown filetype" => "Onbekend bestandsformaat",
 "Invalid image" => "Ongeldige afbeelding",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "november",
 "December" => "december",
 "Settings" => "Instellingen",
+"Saving..." => "Opslaan",
 "seconds ago" => "seconden geleden",
 "_%n minute ago_::_%n minutes ago_" => array("","%n minuten geleden"),
 "_%n hour ago_::_%n hours ago_" => array("","%n uur geleden"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(alles geselecteerd)",
 "({count} selected)" => "({count} geselecteerd)",
 "Error loading file exists template" => "Fout bij laden bestand bestaat al sjabloon",
+"Very weak password" => "Zeer zwak wachtwoord",
+"Weak password" => "Zwak wachtwoord",
+"So-so password" => "Matig wachtwoord",
+"Good password" => "Goed wachtwoord",
+"Strong password" => "Sterk wachtwoord",
 "Shared" => "Gedeeld",
 "Share" => "Delen",
 "Error" => "Fout",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud.",
 "%s password reset" => "%s wachtwoord reset",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Er ontstond een probleem bij het versturen van het e-mailbericht, neem contact op met uw beheerder.",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "De link voor het resetten van je wachtwoord is verzonden naar je e-mailadres.<br>Als je dat bericht niet snel ontvangen hebt, controleer dan uw spambakje.<br>Als het daar ook niet is, vraag dan je beheerder om te helpen.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoord goed waren?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Naar de login-pagina",
 "New password" => "Nieuw wachtwoord",
 "Reset password" => "Reset wachtwoord",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
+"For the best results, please consider using a GNU/Linux server instead." => "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
 "Personal" => "Persoonlijk",
 "Users" => "Gebruikers",
 "Apps" => "Apps",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Je gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet werkt.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
-"Advanced" => "Geavanceerd",
+"Storage & database" => "Opslag & database",
 "Data folder" => "Gegevensmap",
 "Configure the database" => "Configureer de database",
 "will be used" => "zal gebruikt worden",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "onthoud gegevens",
 "Log in" => "Meld je aan",
 "Alternative Logins" => "Alternatieve inlogs",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo daar,<br><br>even een berichtje dat %s »%s« met u deelde.<br><a href=\"%s\">Bekijk hier!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo daar,<br><br>we willen even laten weten dat %s <strong>%s</strong> met u heeft gedeeld.<br><a href=\"%s\">Bekijk het!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
 "This means only administrators can use the instance." => "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Beem contact op met uw systeembeheerder als deze melding aanhoudt of plotseling verscheen.",
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 0221c3945f..e6a80262a2 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,12 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s delte «%s» med deg",
 "Turned on maintenance mode" => "Skrudde på vedlikehaldsmodus",
 "Turned off maintenance mode" => "Skrudde av vedlikehaldsmodus",
 "Updated database" => "Database oppdatert",
-"Updating filecache, this may take really long..." => "Oppdaterer mellomlager; dette kan ta ei god stund …",
-"Updated filecache" => "Mellomlager oppdatert",
-"... %d%% done ..." => "… %d %% ferdig …",
 "No image or file provided" => "Inga bilete eller fil gitt",
 "Unknown filetype" => "Ukjend filtype",
 "Invalid image" => "Ugyldig bilete",
@@ -32,6 +28,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "Desember",
 "Settings" => "Innstillingar",
+"Saving..." => "Lagrar …",
 "seconds ago" => "sekund sidan",
 "_%n minute ago_::_%n minutes ago_" => array("%n minutt sidan","%n minutt sidan"),
 "_%n hour ago_::_%n hours ago_" => array("%n time sidan","%n timar sidan"),
@@ -123,7 +120,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
 "Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
-"Advanced" => "Avansert",
 "Data folder" => "Datamappe",
 "Configure the database" => "Set opp databasen",
 "will be used" => "vil verta nytta",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index f5016757bc..102514a462 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "Novembre",
 "December" => "Decembre",
 "Settings" => "Configuracion",
+"Saving..." => "Enregistra...",
 "seconds ago" => "segonda a",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
@@ -78,7 +79,6 @@ $TRANSLATIONS = array(
 "Cloud not found" => "Nívol pas trobada",
 "Security Warning" => "Avertiment de securitat",
 "Create an <strong>admin account</strong>" => "Crea un <strong>compte admin</strong>",
-"Advanced" => "Avançat",
 "Data folder" => "Dorsièr de donadas",
 "Configure the database" => "Configura la basa de donadas",
 "will be used" => "serà utilizat",
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
index b637c429a6..395928dc35 100644
--- a/core/l10n/pa.php
+++ b/core/l10n/pa.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "ਨਵੰਬ",
 "December" => "ਦਸੰਬਰ",
 "Settings" => "ਸੈਟਿੰਗ",
+"Saving..." => "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
 "seconds ago" => "ਸਕਿੰਟ ਪਹਿਲਾਂ",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 711ebcebe2..17fde36c7c 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
+"Expiration date is in the past." => "Data wygaśnięcia jest w przeszłości",
 "Couldn't send mail to following users: %s " => "Nie można było wysłać wiadomości do następujących użytkowników: %s",
 "Turned on maintenance mode" => "Włączony tryb konserwacji",
 "Turned off maintenance mode" => "Wyłączony tryb konserwacji",
 "Updated database" => "Zaktualizuj bazę",
-"Updating filecache, this may take really long..." => "Aktualizowanie filecache, to może potrwać bardzo długo...",
-"Updated filecache" => "Zaktualizuj filecache",
-"... %d%% done ..." => "... %d%% udane ...",
 "No image or file provided" => "Brak obrazu lub pliku dostarczonego",
 "Unknown filetype" => "Nieznany typ pliku",
 "Invalid image" => "Nieprawidłowe zdjęcie",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "Listopad",
 "December" => "Grudzień",
 "Settings" => "Ustawienia",
+"Saving..." => "Zapisywanie...",
 "seconds ago" => "sekund temu",
 "_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"),
 "_%n hour ago_::_%n hours ago_" => array("%n godzine temu","%n godzin temu","%n godzin temu"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(wszystkie zaznaczone)",
 "({count} selected)" => "({count} zaznaczonych)",
 "Error loading file exists template" => "Błąd podczas ładowania szablonu istniejącego pliku",
+"Very weak password" => "Bardzo słabe hasło",
+"Weak password" => "Słabe hasło",
+"So-so password" => "Mało skomplikowane hasło",
+"Good password" => "Dobre hasło",
+"Strong password" => "Mocne hasło",
 "Shared" => "Udostępniono",
 "Share" => "Udostępnij",
 "Error" => "Błąd",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">spoleczności ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
 "%s password reset" => "%s reset hasła",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Pojawił się problem podczas wysyłania wiadomości email, skontaktuj się z administratorem",
 "Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Link do zresetowania hasła została wysłana na adres email. <br> Jeśli nie otrzymasz go w najbliższym czasie, sprawdź folder ze spamem. <br> Jeśli go tam nie ma zwrócić się do administratora tego ownCloud-a.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są poprawne?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Do strony logowania",
 "New password" => "Nowe hasło",
 "Reset password" => "Zresetuj hasło",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
+"For the best results, please consider using a GNU/Linux server instead." => "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
 "Personal" => "Osobiste",
 "Users" => "Użytkownicy",
 "Apps" => "Aplikacje",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
 "Create an <strong>admin account</strong>" => "Utwórz <strong>konta administratora</strong>",
-"Advanced" => "Zaawansowane",
+"Storage & database" => "Zasoby dysku & baza danych",
 "Data folder" => "Katalog danych",
 "Configure the database" => "Skonfiguruj bazę danych",
 "will be used" => "zostanie użyte",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "pamiętaj",
 "Log in" => "Zaloguj",
 "Alternative Logins" => "Alternatywne loginy",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Ta instalacja ownCloud działa obecnie w trybie pojedynczego użytkownika.",
 "This means only administrators can use the instance." => "To oznacza, że tylko administratorzy mogą w tej chwili używać aplikacji.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Skontaktuj się z administratorem, jeśli ten komunikat pojawił się nieoczekiwanie lub wyświetla się ciągle.",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index e4dd68b99d..b31925cdf7 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s compartilhou »%s« com você",
+"Expiration date is in the past." => "A data de vencimento passou.",
 "Couldn't send mail to following users: %s " => "Não foi possível enviar e-mail para os seguintes usuários: %s",
 "Turned on maintenance mode" => "Ativar modo de manutenção",
 "Turned off maintenance mode" => "Desligar o modo de manutenção",
 "Updated database" => "Atualizar o banco de dados",
-"Updating filecache, this may take really long..." => "Atualizar cahe de arquivos, isto pode levar algum tempo...",
-"Updated filecache" => "Atualizar cache de arquivo",
-"... %d%% done ..." => "... %d%% concluído ...",
 "No image or file provided" => "Nenhuma imagem ou arquivo fornecido",
 "Unknown filetype" => "Tipo de arquivo desconhecido",
 "Invalid image" => "Imagem inválida",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "novembro",
 "December" => "dezembro",
 "Settings" => "Ajustes",
+"Saving..." => "Salvando...",
 "seconds ago" => "segundos atrás",
 "_%n minute ago_::_%n minutes ago_" => array(" ha %n minuto","ha %n minutos"),
 "_%n hour ago_::_%n hours ago_" => array("ha %n hora","ha %n horas"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(todos os selecionados)",
 "({count} selected)" => "({count} selecionados)",
 "Error loading file exists template" => "Erro ao carregar arquivo existe modelo",
+"Very weak password" => "Senha muito fraca",
+"Weak password" => "Senha fraca",
+"So-so password" => "So-so senha",
+"Good password" => "Boa senha",
+"Strong password" => "Senha forte",
 "Shared" => "Compartilhados",
 "Share" => "Compartilhar",
 "Error" => "Erro",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A atualização falhou. Por favor, relate este problema para a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunidade ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
 "%s password reset" => "%s redefinir senha",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Um problema ocorreu durante o envio do e-mail, por favor, contate o administrador.",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "O link para redefinir sua senha foi enviada para o seu e-mail. <br> Se você não recebê-lo dentro de um período razoável de tempo, verifique o spam/lixo. <br> Se ele não estiver lá perguntar ao seu administrador local.",
 "Request failed!<br>Did you make sure your email/username was right?" => "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corretos?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Para a página de login",
 "New password" => "Nova senha",
 "Reset password" => "Redefinir senha",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
+"For the best results, please consider using a GNU/Linux server instead." => "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
 "Personal" => "Pessoal",
 "Users" => "Usuários",
 "Apps" => "Aplicações",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta de administrador</strong>",
-"Advanced" => "Avançado",
+"Storage & database" => "Armazenamento & banco de dados",
 "Data folder" => "Pasta de dados",
 "Configure the database" => "Configurar o banco de dados",
 "will be used" => "será usado",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "lembrar",
 "Log in" => "Fazer login",
 "Alternative Logins" => "Logins alternativos",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Olá,<br><br>só gostaria que você soubesse que %s compartilhou »%s« com você.<br><a href=\"%s\">Veja isto!</a><br><br",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Olá,<br><br>só para seu conhecimento que %s compartilhou <strong>%s</strong> com você. <br><a href=\"%s\">Verificar!</a><br><br> ",
 "This ownCloud instance is currently in single user mode." => "Nesta instância ownCloud está em modo de usuário único.",
 "This means only administrators can use the instance." => "Isso significa que apenas os administradores podem usar o exemplo.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador do sistema se esta mensagem persistir ou aparecer inesperadamente.",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 1d6429ddf2..a4d6785cd5 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -1,16 +1,14 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s partilhado »%s« contigo",
+"Couldn't send mail to following users: %s " => "Não conseguiu enviar correio aos seguintes utilizadores: %s",
 "Turned on maintenance mode" => "Activado o modo de manutenção",
 "Turned off maintenance mode" => "Desactivado o modo de manutenção",
 "Updated database" => "Base de dados actualizada",
-"Updating filecache, this may take really long..." => "A actualizar o cache dos ficheiros, poderá demorar algum tempo...",
-"Updated filecache" => "Actualizado o cache dos ficheiros",
-"... %d%% done ..." => "... %d%% feito ...",
 "No image or file provided" => "Não foi selecionado nenhum ficheiro para importar",
 "Unknown filetype" => "Ficheiro desconhecido",
 "Invalid image" => "Imagem inválida",
 "No temporary profile picture available, try again" => "Foto temporária de perfil indisponível, tente novamente",
+"No crop data provided" => "Sem dados de corte fornecidos",
 "Sunday" => "Domingo",
 "Monday" => "Segunda",
 "Tuesday" => "Terça",
@@ -31,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "Novembro",
 "December" => "Dezembro",
 "Settings" => "Configurações",
+"Saving..." => "A guardar...",
 "seconds ago" => "Minutos atrás",
 "_%n minute ago_::_%n minutes ago_" => array("%n minuto atrás","%n minutos atrás"),
 "_%n hour ago_::_%n hours ago_" => array("%n hora atrás","%n horas atrás"),
@@ -43,16 +42,20 @@ $TRANSLATIONS = array(
 "last year" => "ano passado",
 "years ago" => "anos atrás",
 "Choose" => "Escolha",
+"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
 "Yes" => "Sim",
 "No" => "Não",
 "Ok" => "Ok",
 "Error loading message template: {error}" => "Erro ao carregar o template: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de ficheiro","{count} conflitos de ficheiro"),
+"One file conflict" => "Um conflito no ficheiro",
 "Which files do you want to keep?" => "Quais os ficheiros que pretende manter?",
+"If you select both versions, the copied file will have a number added to its name." => "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
 "Cancel" => "Cancelar",
 "Continue" => "Continuar",
 "(all selected)" => "(todos seleccionados)",
 "({count} selected)" => "({count} seleccionados)",
+"Error loading file exists template" => "Erro ao carregar o modelo de existências do ficheiro",
 "Shared" => "Partilhado",
 "Share" => "Partilhar",
 "Error" => "Erro",
@@ -61,6 +64,7 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Erro ao mudar permissões",
 "Shared with you and the group {group} by {owner}" => "Partilhado consigo e com o grupo {group} por {owner}",
 "Shared with you by {owner}" => "Partilhado consigo por {owner}",
+"Share with user or group …" => "Partilhar com utilizador ou grupo...",
 "Share link" => "Partilhar o link",
 "Password protect" => "Proteger com palavra-passe",
 "Password" => "Password",
@@ -89,8 +93,13 @@ $TRANSLATIONS = array(
 "Email sent" => "E-mail enviado",
 "Warning" => "Aviso",
 "The object type is not specified." => "O tipo de objecto não foi especificado",
+"Enter new" => "Introduza novo",
 "Delete" => "Eliminar",
 "Add" => "Adicionar",
+"Edit tags" => "Editar etiquetas",
+"Error loading dialog template: {error}" => "Erro ao carregar modelo de diálogo: {error}",
+"No tags selected for deletion." => "Não foram escolhidas etiquetas para apagar.",
+"Please reload the page." => "Por favor recarregue a página.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "A actualização falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora.",
 "%s password reset" => "%s reposição da password",
@@ -111,9 +120,18 @@ $TRANSLATIONS = array(
 "Apps" => "Aplicações",
 "Admin" => "Admin",
 "Help" => "Ajuda",
+"Error loading tags" => "Erro ao carregar etiquetas",
+"Tag already exists" => "A etiqueta já existe",
+"Error deleting tag(s)" => "Erro ao apagar etiqueta(s)",
+"Error tagging" => "Erro ao etiquetar",
+"Error untagging" => "Erro ao desetiquetar",
+"Error favoriting" => "Erro a definir como favorito",
+"Error unfavoriting" => "Erro a remover como favorito",
 "Access forbidden" => "Acesso interdito",
 "Cloud not found" => "Cloud nao encontrada",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\napenas para informar que %s partilhou »%s« consigo.\nConsulte aqui: %s\n",
 "The share will expire on %s." => "Esta partilha vai expirar em %s.",
+"Cheers!" => "Parabéns!",
 "Security Warning" => "Aviso de Segurança",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.",
@@ -122,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
 "Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
-"Advanced" => "Avançado",
 "Data folder" => "Pasta de dados",
 "Configure the database" => "Configure a base de dados",
 "will be used" => "vai ser usada",
@@ -133,17 +150,24 @@ $TRANSLATIONS = array(
 "Database host" => "Anfitrião da base de dados",
 "Finish setup" => "Acabar instalação",
 "Finishing …" => "A terminar...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Esta aplicação requer JavaScript ativado para uma operação correta. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">ative o JavaScript</a> e recarregue esta interface.",
 "%s is available. Get more information on how to update." => "%s está disponível. Tenha mais informações como actualizar.",
 "Log out" => "Sair",
 "Automatic logon rejected!" => "Login automático rejeitado!",
 "If you did not change your password recently, your account may be compromised!" => "Se não mudou a sua palavra-passe recentemente, a sua conta pode ter sido comprometida!",
 "Please change your password to secure your account again." => "Por favor mude a sua palavra-passe para assegurar a sua conta de novo.",
+"Server side authentication failed!" => "Autenticação do lado do servidor falhou!",
 "Please contact your administrator." => "Por favor contacte o administrador.",
 "Lost your password?" => "Esqueceu-se da sua password?",
 "remember" => "lembrar",
 "Log in" => "Entrar",
 "Alternative Logins" => "Contas de acesso alternativas",
+"This ownCloud instance is currently in single user mode." => "Esta instância do ownCloud está actualmente configurada no modo de utilizador único.",
+"This means only administrators can use the instance." => "Isto significa que apenas os administradores podem usar a instância.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.",
 "Thank you for your patience." => "Obrigado pela sua paciência.",
-"Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versão %s, esta operação pode demorar."
+"Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versão %s, esta operação pode demorar.",
+"This ownCloud instance is currently being updated, which may take a while." => "Esta instância do ownCloud está a ser actualizada, poderá demorar algum tempo.",
+"Please reload this page after a short time to continue using ownCloud." => "Por favo recarregue esta página após algum tempo para continuar a usar ownCloud."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index dda1b75d30..306c181bfd 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
 "Updated database" => "Bază de date actualizată",
 "Unknown filetype" => "Tip fișier necunoscut",
 "Invalid image" => "Imagine invalidă",
@@ -24,6 +23,7 @@ $TRANSLATIONS = array(
 "November" => "Noiembrie",
 "December" => "Decembrie",
 "Settings" => "Setări",
+"Saving..." => "Se salvează...",
 "seconds ago" => "secunde în urmă",
 "_%n minute ago_::_%n minutes ago_" => array("acum %n minut","acum %n minute","acum %n minute"),
 "_%n hour ago_::_%n hours ago_" => array("acum %n oră","acum %n ore","acum %n ore"),
@@ -109,7 +109,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
 "Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
-"Advanced" => "Avansat",
 "Data folder" => "Director date",
 "Configure the database" => "Configurează baza de date",
 "will be used" => "vor fi folosite",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index cd889e98e1..e2fdc36be0 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s поделился »%s« с вами",
+"Expiration date is in the past." => "Дата истечения срока действия в прошлом.",
 "Couldn't send mail to following users: %s " => "Невозможно отправить письмо следующим пользователям: %s",
 "Turned on maintenance mode" => "Режим отладки включён",
 "Turned off maintenance mode" => "Режим отладки отключён",
 "Updated database" => "База данных обновлена",
-"Updating filecache, this may take really long..." => "Обновление файлового кэша, это может занять некоторое время...",
-"Updated filecache" => "Обновлен файловый кэш",
-"... %d%% done ..." => "... %d%% завершено ...",
 "No image or file provided" => "Не указано изображение или файл",
 "Unknown filetype" => "Неизвестный тип файла",
 "Invalid image" => "Изображение повреждено",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "Ноябрь",
 "December" => "Декабрь",
 "Settings" => "Конфигурация",
+"Saving..." => "Сохранение...",
 "seconds ago" => "несколько секунд назад",
 "_%n minute ago_::_%n minutes ago_" => array("%n минуту назад","%n минуты назад","%n минут назад"),
 "_%n hour ago_::_%n hours ago_" => array("%n час назад","%n часа назад","%n часов назад"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(выбраны все)",
 "({count} selected)" => "({count} выбрано)",
 "Error loading file exists template" => "Ошибка при загрузке шаблона существующего файла",
+"Very weak password" => "Очень слабый пароль",
+"Weak password" => "Слабый пароль",
+"So-so password" => "Так себе пароль",
+"Good password" => "Хороший пароль",
+"Strong password" => "Устойчивый к взлому пароль",
 "Shared" => "Общие",
 "Share" => "Открыть доступ",
 "Error" => "Ошибка",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
 "%s password reset" => "%s сброс пароля",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Произошла ошибка при отправке сообщения электронной почты, пожалуйста, свяжитесь с Вашим администратором.",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Ссылка для сброса пароля отправлена вам ​​по электронной почте.<br>Если вы не получите письмо в пределах одной-двух минут, проверьте папку Спам. <br>Если письма там нет, обратитесь к своему администратору.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Запрос не удался. Вы уверены, что email или имя пользователя указаны верно?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "На страницу авторизации",
 "New password" => "Новый пароль",
 "Reset password" => "Сбросить пароль",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
+"For the best results, please consider using a GNU/Linux server instead." => "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
 "Personal" => "Личное",
 "Users" => "Пользователи",
 "Apps" => "Приложения",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
-"Advanced" => "Дополнительно",
+"Storage & database" => "Система хранения данных & база данных",
 "Data folder" => "Директория с данными",
 "Configure the database" => "Настройка базы данных",
 "will be used" => "будет использовано",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "запомнить",
 "Log in" => "Войти",
 "Alternative Logins" => "Альтернативные имена пользователя",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здравствуйте,<br><br>просто даём вам знать, что %s расшарил %s для вас.<br><a href=\"%s\">Посмотреть!</a><br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здравствуйте,<br><br>просто даём вам знать, что %s открыл доступ к %s для вас.<br><a href=\"%s\">Посмотреть!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Эта установка ownCloud в настоящее время в однопользовательском режиме.",
 "This means only administrators can use the instance." => "Это значит, что только администраторы могут использовать эту установку.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index 0b788ad73f..bcfb18520a 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "නොවැම්බර්",
 "December" => "දෙසැම්බර්",
 "Settings" => "සිටුවම්",
+"Saving..." => "සුරැකෙමින් පවතී...",
 "seconds ago" => "තත්පරයන්ට පෙර",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
@@ -73,7 +74,6 @@ $TRANSLATIONS = array(
 "Cloud not found" => "සොයා ගත නොහැක",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිත අහඹු සංඛ්‍යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්‍ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක.",
-"Advanced" => "දියුණු/උසස්",
 "Data folder" => "දත්ත ෆෝල්ඩරය",
 "Configure the database" => "දත්ත සමුදාය හැඩගැසීම",
 "will be used" => "භාවිතා වනු ඇත",
diff --git a/core/l10n/sk.php b/core/l10n/sk.php
index d9ab70db1a..c0a4ae1257 100644
--- a/core/l10n/sk.php
+++ b/core/l10n/sk.php
@@ -29,7 +29,6 @@ $TRANSLATIONS = array(
 "Share" => "Zdieľať",
 "group" => "skupina",
 "Delete" => "Odstrániť",
-"Personal" => "Osobné",
-"Advanced" => "Pokročilé"
+"Personal" => "Osobné"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 8fb62cd17a..bb3c9863ce 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s s vami zdieľa »%s«",
 "Couldn't send mail to following users: %s " => "Nebolo možné odoslať email týmto používateľom: %s ",
 "Turned on maintenance mode" => "Mód údržby je zapnutý",
 "Turned off maintenance mode" => "Mód údržby e vypnutý",
 "Updated database" => "Databáza je aktualizovaná",
-"Updating filecache, this may take really long..." => "Aktualizácia \"filecache\", toto môže trvať dlhšie...",
-"Updated filecache" => "\"Filecache\" aktualizovaná",
-"... %d%% done ..." => "... %d%% dokončených ...",
 "No image or file provided" => "Obrázok alebo súbor nebol zadaný",
 "Unknown filetype" => "Neznámy typ súboru",
 "Invalid image" => "Chybný obrázok",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "December",
 "Settings" => "Nastavenia",
+"Saving..." => "Ukladám...",
 "seconds ago" => "pred sekundami",
 "_%n minute ago_::_%n minutes ago_" => array("pred %n minútou","pred %n minútami","pred %n minútami"),
 "_%n hour ago_::_%n hours ago_" => array("pred %n hodinou","pred %n hodinami","pred %n hodinami"),
@@ -103,13 +100,13 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Chyba pri načítaní šablóny dialógu: {error}",
 "No tags selected for deletion." => "Nie sú vybraté štítky na zmazanie.",
 "Please reload the page." => "Obnovte prosím stránku.",
-"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
-"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku.",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizácia nebola úspešná. Problém nahláste <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud comunite</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
 "%s password reset" => "reset hesla %s",
 "Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovenie hesla bol odoslaný na Vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si Váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Odkaz na obnovenie hesla bol odoslaný na vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Požiadavka zlyhala.<br>Uistili ste sa, že vaše používateľské meno a email sú správne?",
-"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte e-mailom.",
+"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte emailom.",
 "Username" => "Meno používateľa",
 "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
 "Yes, I really want to reset my password now" => "Áno, želám si teraz obnoviť svoje heslo",
@@ -132,9 +129,9 @@ $TRANSLATIONS = array(
 "Error unfavoriting" => "Chyba pri odobratí z obľúbených",
 "Access forbidden" => "Prístup odmietnutý",
 "Cloud not found" => "Nenájdené",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ahoj,\n\nchcem ti dať navedomie, že %s zdieľa %s s tebou.\nZobrazenie tu: %s\n\n",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ahoj,\n\nchcem ti dať navedomie, že %s s tebou zdieľa %s.\nTu je odkaz: %s\n\n",
 "The share will expire on %s." => "Zdieľanie expiruje %s.",
-"Cheers!" => "Za zdravie!",
+"Cheers!" => "Pekný deň!",
 "Security Warning" => "Bezpečnostné varovanie",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
@@ -143,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
 "Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
-"Advanced" => "Rozšírené",
 "Data folder" => "Priečinok dát",
 "Configure the database" => "Nastaviť databázu",
 "will be used" => "bude použité",
@@ -155,18 +151,17 @@ $TRANSLATIONS = array(
 "Finish setup" => "Dokončiť inštaláciu",
 "Finishing …" => "Dokončujem...",
 "This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Táto aplikácia vyžaduje JavaScript a tento musí byť povolený pre správnu funkciu aplikácie. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povoľte JavaScript</a> a znovunačítajte toto rozhranie.",
-"%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií k postupu aktualizácie.",
+"%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií o postupe aktualizácie.",
 "Log out" => "Odhlásiť",
 "Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
-"If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste nezmenili svoje heslo, váš účet môže byť kompromitovaný.",
-"Please change your password to secure your account again." => "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie vášho účtu",
+"If you did not change your password recently, your account may be compromised!" => "V nedávnej dobe ste si nezmenili svoje heslo, váš účet môže byť kompromitovaný.",
+"Please change your password to secure your account again." => "Prosím, zmeňte si svoje heslo pre opätovné zabezpečenie vášho účtu.",
 "Server side authentication failed!" => "Autentifikácia na serveri zlyhala!",
 "Please contact your administrator." => "Kontaktujte prosím vášho administrátora.",
 "Lost your password?" => "Zabudli ste heslo?",
 "remember" => "zapamätať",
 "Log in" => "Prihlásiť sa",
 "Alternative Logins" => "Alternatívne prihlásenie",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ahoj,<br><br>chcem ti dať navedomie, že %s zdieľa »%s« s tebou.<br><a href=\"%s\">Zobrazenie tu!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Táto inštancia ownCloudu je teraz v jednopoužívateľskom móde.",
 "This means only administrators can use the instance." => "Len správca systému môže používať túto inštanciu.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 933ccf5556..49eb4f9aa6 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s je omogočil souporabo »%s«",
+"Expiration date is in the past." => "Datum preteka je v preteklosti.",
 "Couldn't send mail to following users: %s " => "Ni mogoče poslati sporočila za: %s",
 "Turned on maintenance mode" => "Vzdrževalni način je omogočen",
 "Turned off maintenance mode" => "Vzdrževalni način je onemogočen",
 "Updated database" => "Posodobljena podatkovna zbirka",
-"Updating filecache, this may take really long..." => "Poteka posodabljanje predpomnilnika datotek. Opravilo je lahko dolgotrajno ...",
-"Updated filecache" => "Predpomnilnik datotek je posodobljen",
-"... %d%% done ..." => "... %d%% končano ...",
 "No image or file provided" => "Ni podane datoteke ali slike",
 "Unknown filetype" => "Neznana vrsta datoteke",
 "Invalid image" => "Neveljavna slika",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "november",
 "December" => "december",
 "Settings" => "Nastavitve",
+"Saving..." => "Poteka shranjevanje ...",
 "seconds ago" => "pred nekaj sekundami",
 "_%n minute ago_::_%n minutes ago_" => array("pred %n minuto","pred %n minutama","pred %n minutami","pred %n minutami"),
 "_%n hour ago_::_%n hours ago_" => array("pred %n uro","pred %n urama","pred %n urami","pred %n urami"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(vse izbrano)",
 "({count} selected)" => "({count} izbranih)",
 "Error loading file exists template" => "Napaka nalaganja predloge obstoječih datotek",
+"Very weak password" => "Zelo šibko geslo",
+"Weak password" => "Šibko geslo",
+"So-so password" => "Slabo geslo",
+"Good password" => "Dobro geslo",
+"Strong password" => "Odlično geslo",
 "Shared" => "V souporabi",
 "Share" => "Souporaba",
 "Error" => "Napaka",
@@ -106,6 +109,7 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
 "%s password reset" => "Ponastavitev gesla %s",
+"A problem has occurred whilst sending the email, please contact your administrator." => "Prišlo je do napake med pošiljanjem elektronskega sporočila. Stopite v stik s skrbnikom sistema.",
 "Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Povezava za ponastavitev gesla je bila poslana na elektronski naslov.<br>V kolikor sporočila ne prejmete v doglednem času, preverite tudi mape vsiljene pošte.<br>Če ne bo niti tam, stopite v stik s skrbnikom.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Na prijavno stran",
 "New password" => "Novo geslo",
 "Reset password" => "Ponastavi geslo",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
+"For the best results, please consider using a GNU/Linux server instead." => "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
 "Personal" => "Osebno",
 "Users" => "Uporabniki",
 "Apps" => "Programi",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
-"Advanced" => "Napredne možnosti",
+"Storage & database" => "Shramba in podatkovna zbirka",
 "Data folder" => "Podatkovna mapa",
 "Configure the database" => "Nastavi podatkovno zbirko",
 "will be used" => "bo uporabljen",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "zapomni si",
 "Log in" => "Prijava",
 "Alternative Logins" => "Druge prijavne možnosti",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Pozdravljeni,<br><br>oseba %s vam je omogočila souporabo %s.<br>Vir si lahko ogledate na <a href=\"%s\">tem naslovu</a>.<br><br>",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
 "This means only administrators can use the instance." => "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
index 64d51b35a5..bfb7b0903f 100644
--- a/core/l10n/sq.php
+++ b/core/l10n/sq.php
@@ -1,12 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s ndau »%s« me ju",
 "Turned on maintenance mode" => "Mënyra e mirëmbajtjes u aktivizua",
 "Turned off maintenance mode" => "Mënyra e mirëmbajtjes u çaktivizua",
 "Updated database" => "Database-i u azhurnua",
-"Updating filecache, this may take really long..." => "Po azhurnoj memorjen e skedarëve, mund të zgjasi pak...",
-"Updated filecache" => "Memorja e skedarëve u azhornua",
-"... %d%% done ..." => "... %d%% u krye ...",
 "Sunday" => "E djelë",
 "Monday" => "E hënë",
 "Tuesday" => "E martë",
@@ -27,6 +23,7 @@ $TRANSLATIONS = array(
 "November" => "Nëntor",
 "December" => "Dhjetor",
 "Settings" => "Parametra",
+"Saving..." => "Duke ruajtur...",
 "seconds ago" => "sekonda më parë",
 "_%n minute ago_::_%n minutes ago_" => array("%n minut më parë","%n minuta më parë"),
 "_%n hour ago_::_%n hours ago_" => array("%n orë më parë","%n orë më parë"),
@@ -108,7 +105,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
 "Create an <strong>admin account</strong>" => "Krijo një <strong>llogari administruesi</strong>",
-"Advanced" => "Të përparuara",
 "Data folder" => "Emri i dosjes",
 "Configure the database" => "Konfiguro database-in",
 "will be used" => "do të përdoret",
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index e5f3f0e6cb..55eee982a6 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "Новембар",
 "December" => "Децембар",
 "Settings" => "Поставке",
+"Saving..." => "Чување у току...",
 "seconds ago" => "пре неколико секунди",
 "_%n minute ago_::_%n minutes ago_" => array("","",""),
 "_%n hour ago_::_%n hours ago_" => array("","",""),
@@ -88,7 +89,6 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Поуздан генератор случајних бројева није доступан, предлажемо да укључите PHP проширење OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без поузданог генератора случајнох бројева нападач лако може предвидети лозинку за поништавање кључа шифровања и отети вам налог.",
 "Create an <strong>admin account</strong>" => "Направи <strong>административни налог</strong>",
-"Advanced" => "Напредно",
 "Data folder" => "Фацикла података",
 "Configure the database" => "Подешавање базе",
 "will be used" => "ће бити коришћен",
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index 8a27ec15cf..e7eb2b499a 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -25,7 +25,7 @@ $TRANSLATIONS = array(
 "_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "Danas",
 "yesterday" => "juče",
-"_%n day ago_::_%n days ago_" => array("","",""),
+"_%n day ago_::_%n days ago_" => array("Prije %n dan.","Prije %n dana.","Prije %n dana."),
 "last month" => "prošlog meseca",
 "_%n month ago_::_%n months ago_" => array("","",""),
 "months ago" => "pre nekoliko meseci",
@@ -92,7 +92,6 @@ $TRANSLATIONS = array(
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez generatora slučajnog broja napadač može predvideti token za reset lozinke i preuzeti Vaš nalog.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
 "Create an <strong>admin account</strong>" => "Napravi <strong>administrativni nalog</strong>",
-"Advanced" => "Napredno",
 "Data folder" => "Fascikla podataka",
 "Configure the database" => "Podešavanje baze",
 "will be used" => "će biti korišćen",
@@ -105,6 +104,7 @@ $TRANSLATIONS = array(
 "Log out" => "Odjava",
 "Automatic logon rejected!" => "Automatsko logovanje odbijeno!",
 "Lost your password?" => "Izgubili ste lozinku?",
-"remember" => "upamti"
+"remember" => "upamti",
+"Log in" => "Prijavi se"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/su.php b/core/l10n/su.php
new file mode 100644
index 0000000000..dbedde7e63
--- /dev/null
+++ b/core/l10n/su.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array(""),
+"_{count} file conflict_::_{count} file conflicts_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index fe67ae9aef..c4e92e6217 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s delade »%s« med dig",
 "Couldn't send mail to following users: %s " => "Gick inte att skicka e-post till följande användare: %s",
 "Turned on maintenance mode" => "Aktiverade underhållsläge",
 "Turned off maintenance mode" => "Deaktiverade underhållsläge",
 "Updated database" => "Uppdaterade databasen",
-"Updating filecache, this may take really long..." => "Uppdaterar filcache, det kan ta lång tid...",
-"Updated filecache" => "Uppdaterade filcache",
-"... %d%% done ..." => "... %d%% klart ...",
 "No image or file provided" => "Ingen bild eller fil har tillhandahållits",
 "Unknown filetype" => "Okänd filtyp",
 "Invalid image" => "Ogiltig bild",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "November",
 "December" => "December",
 "Settings" => "Inställningar",
+"Saving..." => "Sparar...",
 "seconds ago" => "sekunder sedan",
 "_%n minute ago_::_%n minutes ago_" => array("%n minut sedan","%n minuter sedan"),
 "_%n hour ago_::_%n hours ago_" => array("%n timme sedan","%n timmar sedan"),
@@ -142,7 +139,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
 "Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
-"Advanced" => "Avancerad",
 "Data folder" => "Datamapp",
 "Configure the database" => "Konfigurera databasen",
 "will be used" => "kommer att användas",
@@ -164,7 +160,6 @@ $TRANSLATIONS = array(
 "remember" => "kom ihåg",
 "Log in" => "Logga in",
 "Alternative Logins" => "Alternativa inloggningar",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Hör av dig till din system administratör ifall detta meddelande fortsätter eller visas oväntat.",
 "Thank you for your patience." => "Tack för ditt tålamod.",
 "Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund.",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index ddd1e524a3..95468a9d7a 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "கார்த்திகை",
 "December" => "மார்கழி",
 "Settings" => "அமைப்புகள்",
+"Saving..." => "சேமிக்கப்படுகிறது...",
 "seconds ago" => "செக்கன்களுக்கு முன்",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
@@ -85,7 +86,6 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "குறிப்பிட்ட எண்ணிக்கை பாதுகாப்பான புறப்பாக்கி / உண்டாக்கிகள் இல்லை, தயவுசெய்து PHP OpenSSL நீட்சியை இயலுமைப்படுத்துக. ",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "பாதுகாப்பான சீரற்ற எண்ணிக்கையான புறப்பாக்கி இல்லையெனின், தாக்குனரால் கடவுச்சொல் மீளமைப்பு அடையாளவில்லைகள் முன்மொழியப்பட்டு உங்களுடைய கணக்கை கைப்பற்றலாம்.",
 "Create an <strong>admin account</strong>" => "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
-"Advanced" => "உயர்ந்த",
 "Data folder" => "தரவு கோப்புறை",
 "Configure the database" => "தரவுத்தளத்தை தகவமைக்க",
 "will be used" => "பயன்படுத்தப்படும்",
diff --git a/core/l10n/te.php b/core/l10n/te.php
index 0754429351..9c22a61aa7 100644
--- a/core/l10n/te.php
+++ b/core/l10n/te.php
@@ -21,13 +21,13 @@ $TRANSLATIONS = array(
 "December" => "డిసెంబర్",
 "Settings" => "అమరికలు",
 "seconds ago" => "క్షణాల క్రితం",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n నిమిషం క్రితం","%n నిమిషాల క్రితం"),
+"_%n hour ago_::_%n hours ago_" => array("%n గంట క్రితం","%n గంటల క్రితం"),
 "today" => "ఈరోజు",
 "yesterday" => "నిన్న",
-"_%n day ago_::_%n days ago_" => array("",""),
+"_%n day ago_::_%n days ago_" => array("%n రోజు క్రితం","%n రోజుల క్రితం"),
 "last month" => "పోయిన నెల",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("%n నెల క్రితం","%n నెలల క్రితం"),
 "months ago" => "నెలల క్రితం",
 "last year" => "పోయిన సంవత్సరం",
 "years ago" => "సంవత్సరాల క్రితం",
@@ -36,15 +36,18 @@ $TRANSLATIONS = array(
 "Ok" => "సరే",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
 "Cancel" => "రద్దుచేయి",
+"Continue" => "కొనసాగించు",
 "Error" => "పొరపాటు",
 "Password" => "సంకేతపదం",
 "Send" => "పంపించు",
 "Expiration date" => "కాలం చెల్లు తేదీ",
 "delete" => "తొలగించు",
+"Warning" => "హెచ్చరిక",
 "Delete" => "తొలగించు",
 "Add" => "చేర్చు",
 "Username" => "వాడుకరి పేరు",
 "New password" => "కొత్త సంకేతపదం",
+"Personal" => "వ్యక్తిగతం",
 "Users" => "వాడుకరులు",
 "Help" => "సహాయం",
 "Log out" => "నిష్క్రమించు",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 2180a6efa7..85a9b4ab23 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "พฤศจิกายน",
 "December" => "ธันวาคม",
 "Settings" => "ตั้งค่า",
+"Saving..." => "กำลังบันทึกข้อมูล...",
 "seconds ago" => "วินาที ก่อนหน้านี้",
 "_%n minute ago_::_%n minutes ago_" => array(""),
 "_%n hour ago_::_%n hours ago_" => array(""),
@@ -92,7 +93,6 @@ $TRANSLATIONS = array(
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "ยังไม่มีตัวสร้างหมายเลขแบบสุ่มให้ใช้งาน, กรุณาเปิดใช้งานส่วนเสริม PHP OpenSSL",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "หากปราศจากตัวสร้างหมายเลขแบบสุ่มที่ช่วยป้องกันความปลอดภัย ผู้บุกรุกอาจสามารถที่จะคาดคะเนรหัสยืนยันการเข้าถึงเพื่อรีเซ็ตรหัสผ่าน และเอาบัญชีของคุณไปเป็นของตนเองได้",
 "Create an <strong>admin account</strong>" => "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
-"Advanced" => "ขั้นสูง",
 "Data folder" => "โฟลเดอร์เก็บข้อมูล",
 "Configure the database" => "กำหนดค่าฐานข้อมูล",
 "will be used" => "จะถูกใช้",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index fc08d68bb1..affa1b063d 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,13 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu",
+"Expiration date is in the past." => "Son kullanma tarihi geçmişte.",
 "Couldn't send mail to following users: %s " => "Şu kullanıcılara posta gönderilemedi: %s",
 "Turned on maintenance mode" => "Bakım kipi etkinleştirildi",
 "Turned off maintenance mode" => "Bakım kipi kapatıldı",
 "Updated database" => "Veritabanı güncellendi",
-"Updating filecache, this may take really long..." => "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir.",
-"Updated filecache" => "Dosya önbelleği güncellendi",
-"... %d%% done ..." => "%%%d tamamlandı ...",
 "No image or file provided" => "Resim veya dosya belirtilmedi",
 "Unknown filetype" => "Bilinmeyen dosya türü",
 "Invalid image" => "Geçersiz resim",
@@ -33,6 +30,7 @@ $TRANSLATIONS = array(
 "November" => "Kasım",
 "December" => "Aralık",
 "Settings" => "Ayarlar",
+"Saving..." => "Kaydediliyor...",
 "seconds ago" => "saniye önce",
 "_%n minute ago_::_%n minutes ago_" => array("%n dakika önce","%n dakika önce"),
 "_%n hour ago_::_%n hours ago_" => array("%n saat önce","%n saat önce"),
@@ -59,6 +57,11 @@ $TRANSLATIONS = array(
 "(all selected)" => "(tümü seçildi)",
 "({count} selected)" => "({count} seçildi)",
 "Error loading file exists template" => "Dosya mevcut şablonu yüklenirken hata",
+"Very weak password" => "Çok güçsüz parola",
+"Weak password" => "Güçsüz parola",
+"So-so password" => "Normal parola",
+"Good password" => "İyi parola",
+"Strong password" => "Güçlü parola",
 "Shared" => "Paylaşılan",
 "Share" => "Paylaş",
 "Error" => "Hata",
@@ -106,8 +109,9 @@ $TRANSLATIONS = array(
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Güncelleme başarılı. ownCloud'a yönlendiriliyor.",
 "%s password reset" => "%s parola sıfırlama",
+"A problem has occurred whilst sending the email, please contact your administrator." => "E-posta gönderilirken bir hata oluştu. Lütfen yönetinizle iletişime geçin.",
 "Use the following link to reset your password: {link}" => "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
-"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz.<br> Eğer orada da bulamazsanız sistem yöneticinize sorunuz.",
+"The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk/gereksiz dizinini kontrol ediniz.<br> Eğer yine bulamazsanız sistem yöneticinize sorunuz.",
 "Request failed!<br>Did you make sure your email/username was right?" => "İstek başarısız!<br>E-posta ve/veya kullanıcı adınızın doğru olduğundan emin misiniz?",
 "You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için bir bağlantıyı e-posta olarak alacaksınız.",
 "Username" => "Kullanıcı Adı",
@@ -118,6 +122,8 @@ $TRANSLATIONS = array(
 "To login page" => "Giriş sayfasına git",
 "New password" => "Yeni parola",
 "Reset password" => "Parolayı sıfırla",
+"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X desteklenmemediğinden %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
+"For the best results, please consider using a GNU/Linux server instead." => "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
 "Personal" => "Kişisel",
 "Users" => "Kullanıcılar",
 "Apps" => "Uygulamalar",
@@ -143,7 +149,7 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için internet'ten erişime açık.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
 "Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
-"Advanced" => "Gelişmiş",
+"Storage & database" => "Depolama ve veritabanı",
 "Data folder" => "Veri klasörü",
 "Configure the database" => "Veritabanını ayarla",
 "will be used" => "kullanılacak",
@@ -166,7 +172,7 @@ $TRANSLATIONS = array(
 "remember" => "hatırla",
 "Log in" => "Giriş yap",
 "Alternative Logins" => "Alternatif Girişler",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Merhaba, <br><br> %s sizinle »%s« paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>İyi günler!",
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Merhaba, <br><br> %s sizinle <strong>%s</strong> paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Bu ownCloud örneği şu anda tek kullanıcı kipinde.",
 "This means only administrators can use the instance." => "Bu, örneği sadece yöneticiler kullanabilir demektir.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.",
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
index c340ff7540..9b92307035 100644
--- a/core/l10n/ug.php
+++ b/core/l10n/ug.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "November" => "ئوغلاق",
 "December" => "كۆنەك",
 "Settings" => "تەڭشەكلەر",
+"Saving..." => "ساقلاۋاتىدۇ…",
 "_%n minute ago_::_%n minutes ago_" => array(""),
 "_%n hour ago_::_%n hours ago_" => array(""),
 "today" => "بۈگۈن",
@@ -49,7 +50,6 @@ $TRANSLATIONS = array(
 "Apps" => "ئەپلەر",
 "Help" => "ياردەم",
 "Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
-"Advanced" => "ئالىي",
 "Finish setup" => "تەڭشەك تامام",
 "Log out" => "تىزىمدىن چىق"
 );
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 3cc151f5a2..ade29981b4 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s розподілено »%s« з тобою",
 "Couldn't send mail to following users: %s " => "Неможливо надіслати пошту наступним користувачам: %s ",
 "Turned on maintenance mode" => "Увімкнено захищений режим",
 "Turned off maintenance mode" => "Вимкнено захищений режим",
 "Updated database" => "Базу даних оновлено",
-"Updating filecache, this may take really long..." => "Оновлення файлового кешу, це може тривати доволі довго...",
-"Updated filecache" => "Файловий кеш оновлено",
-"... %d%% done ..." => "... %d%% виконано ...",
 "No image or file provided" => "Немає наданого зображення або файлу",
 "Unknown filetype" => "Невідомий тип файлу",
 "Invalid image" => "Невірне зображення",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "Листопад",
 "December" => "Грудень",
 "Settings" => "Налаштування",
+"Saving..." => "Зберігаю...",
 "seconds ago" => "секунди тому",
 "_%n minute ago_::_%n minutes ago_" => array("%n хвилину тому","%n хвилини тому","%n хвилин тому"),
 "_%n hour ago_::_%n hours ago_" => array("%n годину тому","%n години тому","%n годин тому"),
@@ -143,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
 "Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>",
-"Advanced" => "Додатково",
 "Data folder" => "Каталог даних",
 "Configure the database" => "Налаштування бази даних",
 "will be used" => "буде використано",
@@ -165,7 +161,6 @@ $TRANSLATIONS = array(
 "remember" => "запам'ятати",
 "Log in" => "Вхід",
 "Alternative Logins" => "Альтернативні Логіни",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Агов,<br><br>просто щоб ви знали, що %s поділився »%s« з вами.<br><a href=\"%s\">Подивіться на це !</a><br><br>",
 "This ownCloud instance is currently in single user mode." => "Цей екземпляр OwnCloud зараз працює в монопольному режимі одного користувача",
 "This means only administrators can use the instance." => "Це означає, що лише адміністратори можуть використовувати цей екземпляр.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Зверніться до системного адміністратора, якщо це повідомлення зберігається або з'являєтья несподівано.",
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
index ed090fdaf7..3012eb869c 100644
--- a/core/l10n/ur_PK.php
+++ b/core/l10n/ur_PK.php
@@ -57,7 +57,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "پہنچ کی اجازت نہیں",
 "Cloud not found" => "نہیں مل سکا",
 "Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
-"Advanced" => "ایڈوانسڈ",
 "Data folder" => "ڈیٹا فولڈر",
 "Configure the database" => "ڈیٹا بیس کونفگر کریں",
 "will be used" => "استعمال ہو گا",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 06decc3a0c..be99580d94 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -1,5 +1,14 @@
 <?php
 $TRANSLATIONS = array(
+"Couldn't send mail to following users: %s " => "Không thể gửi thư cho người dùng: %s",
+"Turned on maintenance mode" => "Bật chế độ bảo trì",
+"Turned off maintenance mode" => "Tắt chế độ bảo trì",
+"Updated database" => "Cơ sở dữ liệu đã được cập nhật",
+"No image or file provided" => "Không có hình ảnh hoặc tập tin được cung cấp",
+"Unknown filetype" => "Không biết kiểu tập tin",
+"Invalid image" => "Hình ảnh không hợp lệ",
+"No temporary profile picture available, try again" => "Ảnh cá nhân tạm thời không có giá trị, hãy thử lại",
+"No crop data provided" => "Không có dữ liệu nguồn được cung cấp",
 "Sunday" => "Chủ nhật",
 "Monday" => "Thứ 2",
 "Tuesday" => "Thứ 3",
@@ -20,23 +29,33 @@ $TRANSLATIONS = array(
 "November" => "Tháng 11",
 "December" => "Tháng 12",
 "Settings" => "Cài đặt",
+"Saving..." => "Đang lưu...",
 "seconds ago" => "vài giây trước",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n phút trước"),
+"_%n hour ago_::_%n hours ago_" => array("%n giờ trước"),
 "today" => "hôm nay",
 "yesterday" => "hôm qua",
-"_%n day ago_::_%n days ago_" => array(""),
+"_%n day ago_::_%n days ago_" => array("%n ngày trước"),
 "last month" => "tháng trước",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n tháng trước"),
 "months ago" => "tháng trước",
 "last year" => "năm trước",
 "years ago" => "năm trước",
 "Choose" => "Chọn",
+"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
 "Yes" => "Có",
 "No" => "Không",
 "Ok" => "Đồng ý",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Error loading message template: {error}" => "Lỗi khi tải mẫu thông điệp: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} tập tin xung đột"),
+"One file conflict" => "Một tập tin xung đột",
+"Which files do you want to keep?" => "Bạn muốn tiếp tục với những tập tin nào?",
+"If you select both versions, the copied file will have a number added to its name." => "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó.",
 "Cancel" => "Hủy",
+"Continue" => "Tiếp tục",
+"(all selected)" => "(Tất cả các lựa chọn)",
+"({count} selected)" => "({count} được chọn)",
+"Error loading file exists template" => "Lỗi khi tải tập tin mẫu đã tồn tại",
 "Shared" => "Được chia sẻ",
 "Share" => "Chia sẻ",
 "Error" => "Lỗi",
@@ -45,8 +64,11 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Lỗi trong quá trình phân quyền",
 "Shared with you and the group {group} by {owner}" => "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
 "Shared with you by {owner}" => "Đã được chia sẽ bởi {owner}",
+"Share with user or group …" => "Chia sẻ với người dùng hoặc nhóm",
+"Share link" => "Chia sẻ liên kết",
 "Password protect" => "Mật khẩu bảo vệ",
 "Password" => "Mật khẩu",
+"Allow Public Upload" => "Cho phép công khai tập tin tải lên",
 "Email link to person" => "Liên kết email tới cá nhân",
 "Send" => "Gởi",
 "Set expiration date" => "Đặt ngày kết thúc",
@@ -57,6 +79,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "Chia sẻ lại không được cho phép",
 "Shared in {item} with {user}" => "Đã được chia sẽ trong {item} với {user}",
 "Unshare" => "Bỏ chia sẻ",
+"notify by email" => "Thông báo qua email",
 "can edit" => "có thể chỉnh sửa",
 "access control" => "quản lý truy cập",
 "create" => "tạo",
@@ -70,15 +93,24 @@ $TRANSLATIONS = array(
 "Email sent" => "Email đã được gửi",
 "Warning" => "Cảnh báo",
 "The object type is not specified." => "Loại đối tượng không được chỉ định.",
+"Enter new" => "Nhập mới",
 "Delete" => "Xóa",
 "Add" => "Thêm",
+"Edit tags" => "Sửa thẻ",
+"Error loading dialog template: {error}" => "Lỗi khi tải mẫu hội thoại: {error}",
+"No tags selected for deletion." => "Không có thẻ nào được chọn để xóa",
+"Please reload the page." => "Vui lòng tải lại trang.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Cập nhật không thành công . Vui lòng thông báo đến <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cộng đồng ownCloud </a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
+"%s password reset" => "%s thiết lập lại mật khẩu",
 "Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Liên kết tạo lại mật khẩu đã được gửi tới hộp thư của bạn.<br>Nếu bạn không thấy nó sau một khoảng thời gian, vui lòng kiểm tra trong thư mục Spam/Rác.<br>Nếu vẫn không thấy, vui lòng hỏi người quản trị hệ thống.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhập của bạn chính xác?",
 "You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
 "Username" => "Tên đăng nhập",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
+"Yes, I really want to reset my password now" => "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
+"Reset" => "Khởi động lại",
 "Your password was reset" => "Mật khẩu của bạn đã được khôi phục",
 "To login page" => "Trang đăng nhập",
 "New password" => "Mật khẩu mới",
@@ -88,15 +120,24 @@ $TRANSLATIONS = array(
 "Apps" => "Ứng dụng",
 "Admin" => "Quản trị",
 "Help" => "Giúp đỡ",
+"Error loading tags" => "Lỗi khi tải thẻ",
+"Tag already exists" => "Thẻ đã tồn tại",
+"Error deleting tag(s)" => "Lỗi khi xóa (nhiều)thẻ",
+"Error tagging" => "Lỗi gắn thẻ",
+"Error untagging" => "Lỗi không gắn thẻ",
 "Access forbidden" => "Truy cập bị cấm",
 "Cloud not found" => "Không tìm thấy Clound",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Xin chào,\n\nbáo cho bạn biết rằng %s đã chia sẽ %s với bạn.\nXem nó: %s\n\n",
+"The share will expire on %s." => "Chia sẻ này sẽ hết hiệu lực vào %s.",
+"Cheers!" => "Chúc mừng!",
 "Security Warning" => "Cảnh bảo bảo mật",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
+"Please update your PHP installation to use %s securely." => "Vui lòng cập nhật bản cài đặt PHP để sử dụng %s một cách an toàn.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Không an toàn ! chức năng random number generator đã có sẵn ,vui lòng bật  PHP OpenSSL extension.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Nếu không có random number generator , Hacker có thể  thiết lập lại mật khẩu và chiếm tài khoản của bạn.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
 "Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>",
-"Advanced" => "Nâng cao",
 "Data folder" => "Thư mục dữ liệu",
 "Configure the database" => "Cấu hình cơ sở dữ liệu",
 "will be used" => "được sử dụng",
@@ -106,15 +147,25 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Cơ sở dữ liệu tablespace",
 "Database host" => "Database host",
 "Finish setup" => "Cài đặt hoàn tất",
+"Finishing …" => "Đang hoàn thành ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "Ứng dụng này yêu cầu JavaScript để hoạt động. Vui lòng <a href=\"http://enable-javascript.com/\" target=\"_blank\">kích hoạt JavaScript</a> và tải lại giao diện này.",
 "%s is available. Get more information on how to update." => "%s còn trống. Xem thêm thông tin cách cập nhật.",
 "Log out" => "Đăng xuất",
 "Automatic logon rejected!" => "Tự động đăng nhập đã bị từ chối !",
 "If you did not change your password recently, your account may be compromised!" => "Nếu bạn không thay đổi mật khẩu gần đây của bạn, tài khoản của bạn có thể gặp nguy hiểm!",
 "Please change your password to secure your account again." => "Vui lòng thay đổi mật khẩu của bạn để đảm bảo tài khoản của bạn một lần nữa.",
+"Server side authentication failed!" => "Xác thực phía máy chủ không thành công!",
+"Please contact your administrator." => "Vui lòng liên hệ với quản trị viên.",
 "Lost your password?" => "Bạn quên mật khẩu ?",
 "remember" => "ghi nhớ",
 "Log in" => "Đăng nhập",
 "Alternative Logins" => "Đăng nhập khác",
-"Updating ownCloud to version %s, this may take a while." => "Cập nhật ownCloud lên phiên bản %s, có thể sẽ mất thời gian"
+"This ownCloud instance is currently in single user mode." => "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất.",
+"This means only administrators can use the instance." => "Điều này có nghĩa chỉ có người quản trị có thể sử dụng trong trường hợp này.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "Liên hệ với người quản trị nếu lỗi này vẫn tồn tại hoặc xuất hiện bất ngờ.",
+"Thank you for your patience." => "Cảm ơn sự kiên nhẫn của bạn.",
+"Updating ownCloud to version %s, this may take a while." => "Cập nhật ownCloud lên phiên bản %s, có thể sẽ mất thời gian",
+"This ownCloud instance is currently being updated, which may take a while." => "Phiên bản ownCloud này hiện đang được cập nhật, có thể sẽ mất một ít thời gian.",
+"Please reload this page after a short time to continue using ownCloud." => "Xin vui lòng tải lại trang này để tiếp tục sử dụng ownCloud."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 3da1b9ca68..e5a6a254e5 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -1,14 +1,14 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s 向您分享了 »%s«",
+"Couldn't send mail to following users: %s " => "发送失败，用户如下: %s ",
 "Turned on maintenance mode" => "启用维护模式",
 "Turned off maintenance mode" => "关闭维护模式",
 "Updated database" => "数据库已更新",
-"Updating filecache, this may take really long..." => "正在更新文件缓存，这可能需要较长时间...",
-"Updated filecache" => "文件缓存已更新",
-"... %d%% done ..." => "...已完成 %d%% ...",
+"No image or file provided" => "没有提供图片或文件",
 "Unknown filetype" => "未知的文件类型",
 "Invalid image" => "无效的图像",
+"No temporary profile picture available, try again" => "没有临时概览页图片可用，请重试",
+"No crop data provided" => "没有提供相应数据",
 "Sunday" => "星期日",
 "Monday" => "星期一",
 "Tuesday" => "星期二",
@@ -29,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "十一月",
 "December" => "十二月",
 "Settings" => "设置",
+"Saving..." => "保存中",
 "seconds ago" => "秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
 "_%n hour ago_::_%n hours ago_" => array("%n 小时前"),
@@ -41,11 +42,20 @@ $TRANSLATIONS = array(
 "last year" => "去年",
 "years ago" => "年前",
 "Choose" => "选择(&C)...",
+"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
 "Yes" => "是",
 "No" => "否",
 "Ok" => "好",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Error loading message template: {error}" => "加载消息模板出错: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} 个文件冲突"),
+"One file conflict" => "1个文件冲突",
+"Which files do you want to keep?" => "想要保留哪一个文件呢？",
+"If you select both versions, the copied file will have a number added to its name." => "如果同时选择了连个版本，复制的文件名将会添加上一个数字。",
 "Cancel" => "取消",
+"Continue" => "继续",
+"(all selected)" => "(选中全部)",
+"({count} selected)" => "(选择了{count}个)",
+"Error loading file exists template" => "加载文件存在性模板失败",
 "Shared" => "已共享",
 "Share" => "分享",
 "Error" => "错误",
@@ -54,6 +64,8 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "修改权限时出错",
 "Shared with you and the group {group} by {owner}" => "{owner} 共享给您及 {group} 组",
 "Shared with you by {owner}" => "{owner} 与您共享",
+"Share with user or group …" => "分享给其他用户或组 ...",
+"Share link" => "分享链接",
 "Password protect" => "密码保护",
 "Password" => "密码",
 "Allow Public Upload" => "允许公开上传",
@@ -67,6 +79,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "不允许二次共享",
 "Shared in {item} with {user}" => "在 {item} 与 {user} 共享。",
 "Unshare" => "取消共享",
+"notify by email" => "以邮件通知",
 "can edit" => "可以修改",
 "access control" => "访问控制",
 "create" => "创建",
@@ -80,8 +93,13 @@ $TRANSLATIONS = array(
 "Email sent" => "邮件已发送",
 "Warning" => "警告",
 "The object type is not specified." => "未指定对象类型。",
+"Enter new" => "输入新...",
 "Delete" => "删除",
 "Add" => "增加",
+"Edit tags" => "编辑标签",
+"Error loading dialog template: {error}" => "加载对话框模板出错: {error}",
+"No tags selected for deletion." => "请选择要删除的标签。",
+"Please reload the page." => "请重新加载页面。",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "更新不成功。请汇报将此问题汇报给  <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud 社区</a>。",
 "The update was successful. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。",
 "%s password reset" => "重置 %s 的密码",
@@ -102,8 +120,18 @@ $TRANSLATIONS = array(
 "Apps" => "应用",
 "Admin" => "管理",
 "Help" => "帮助",
+"Error loading tags" => "加载标签出错",
+"Tag already exists" => "标签已存在",
+"Error deleting tag(s)" => "删除标签(s)时出错",
+"Error tagging" => "添加标签时出错",
+"Error untagging" => "移除标签时出错",
+"Error favoriting" => "收藏时出错",
+"Error unfavoriting" => "删除收藏时出错",
 "Access forbidden" => "访问禁止",
 "Cloud not found" => "未找到云",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "嗨、你好,\n\n只想让你知道 %s 分享了 %s 给你。\n现在查看: %s\n",
+"The share will expire on %s." => "此分享将在 %s 过期。",
+"Cheers!" => "干杯！",
 "Security Warning" => "安全警告",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "为保证安全使用 %s 请更新您的PHP。",
@@ -112,7 +140,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
 "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
-"Advanced" => "高级",
 "Data folder" => "数据目录",
 "Configure the database" => "配置数据库",
 "will be used" => "将被使用",
@@ -122,15 +149,25 @@ $TRANSLATIONS = array(
 "Database tablespace" => "数据库表空间",
 "Database host" => "数据库主机",
 "Finish setup" => "安装完成",
+"Finishing …" => "正在结束 ...",
+"This application requires JavaScript to be enabled for correct operation.  Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and re-load this interface." => "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此接口。",
 "%s is available. Get more information on how to update." => "%s 可用。获取更多关于如何升级的信息。",
 "Log out" => "注销",
 "Automatic logon rejected!" => "自动登录被拒绝！",
 "If you did not change your password recently, your account may be compromised!" => "如果您没有最近修改您的密码，您的帐户可能会受到影响！",
 "Please change your password to secure your account again." => "请修改您的密码，以保护您的账户安全。",
+"Server side authentication failed!" => "服务端验证失败！",
+"Please contact your administrator." => "请联系你的管理员。",
 "Lost your password?" => "忘记密码？",
 "remember" => "记住",
 "Log in" => "登录",
 "Alternative Logins" => "其他登录方式",
-"Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s，这可能需要一些时间。"
+"This ownCloud instance is currently in single user mode." => "当前ownCloud实例运行在单用户模式下。",
+"This means only administrators can use the instance." => "这意味着只有管理员才能在实例上操作。",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "如果这个消息一直存在或不停出现，请联系你的系统管理员。",
+"Thank you for your patience." => "感谢让你久等了。",
+"Updating ownCloud to version %s, this may take a while." => "更新 ownCloud 到版本 %s，这可能需要一些时间。",
+"This ownCloud instance is currently being updated, which may take a while." => "当前ownCloud实例正在更新，可能需要一段时间。",
+"Please reload this page after a short time to continue using ownCloud." => "请稍后重新加载这个页面，以继续使用ownCloud。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
index 809bd7de92..51d78a0979 100644
--- a/core/l10n/zh_HK.php
+++ b/core/l10n/zh_HK.php
@@ -73,7 +73,6 @@ $TRANSLATIONS = array(
 "Help" => "幫助",
 "Cloud not found" => "未找到Cloud",
 "Create an <strong>admin account</strong>" => "建立管理員帳戶",
-"Advanced" => "進階",
 "Configure the database" => "設定資料庫",
 "will be used" => "將被使用",
 "Database user" => "資料庫帳戶",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index d78929ddb9..dae143cef4 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -1,13 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s 與您分享了 %s",
 "Couldn't send mail to following users: %s " => "無法寄送郵件給這些使用者：%s",
 "Turned on maintenance mode" => "已啓用維護模式",
 "Turned off maintenance mode" => "已停用維護模式",
 "Updated database" => "已更新資料庫",
-"Updating filecache, this may take really long..." => "更新檔案快取，這可能要很久…",
-"Updated filecache" => "已更新檔案快取",
-"... %d%% done ..." => "已完成 %d%%",
 "No image or file provided" => "未提供圖片或檔案",
 "Unknown filetype" => "未知的檔案類型",
 "Invalid image" => "無效的圖片",
@@ -33,6 +29,7 @@ $TRANSLATIONS = array(
 "November" => "十一月",
 "December" => "十二月",
 "Settings" => "設定",
+"Saving..." => "儲存中...",
 "seconds ago" => "幾秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分鐘前"),
 "_%n hour ago_::_%n hours ago_" => array("%n 小時前"),
@@ -140,7 +137,6 @@ $TRANSLATIONS = array(
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
 "Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
-"Advanced" => "進階",
 "Data folder" => "資料儲存位置",
 "Configure the database" => "設定資料庫",
 "will be used" => "將會使用",
@@ -162,7 +158,6 @@ $TRANSLATIONS = array(
 "remember" => "記住",
 "Log in" => "登入",
 "Alternative Logins" => "其他登入方法",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "嗨，<br><br>%s 和你分享了 %s ，到<a href=\"%s\">這裡</a>看它<br><br>",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "若這個訊息持續出現，請聯絡系統管理員",
 "Thank you for your patience." => "感謝您的耐心",
 "Updating ownCloud to version %s, this may take a while." => "正在將 ownCloud 升級至版本 %s ，這可能需要一點時間。",
diff --git a/core/routes.php b/core/routes.php
index aea788bdc6..74be880612 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -7,7 +7,8 @@
  */
 
 // Post installation check
-/** @var $this OC_Router */
+
+/** @var $this OCP\Route\IRouter */
 $this->create('post_setup_check', '/post-setup-check')
 	->action('OC_Setup', 'postSetupCheck');
 
@@ -65,8 +66,6 @@ $this->create('core_tags_delete', '/tags/{type}/delete')
 $this->create('js_config', '/core/js/oc.js')
 	->actionInclude('core/js/config.php');
 // Routing
-$this->create('core_ajax_routes', '/core/routes.json')
-	->action('OC_Router', 'JSRoutes');
 $this->create('core_ajax_preview', '/core/preview.png')
 	->actionInclude('core/ajax/preview.php');
 $this->create('core_lostpassword_index', '/lostpassword/')
diff --git a/core/setup/controller.php b/core/setup/controller.php
index 697408cfb5..1a8e9b2b76 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -20,7 +20,7 @@ class Controller {
 			$errors = array('errors' => $e);
 
 			if(count($e) > 0) {
-				$options = array_merge($post, $opts, $errors);
+				$options = array_merge($opts, $post, $errors);
 				$this->display($options);
 			}
 			else {
@@ -28,7 +28,8 @@ class Controller {
 			}
 		}
 		else {
-			$this->display($opts);
+			$options = array_merge($opts, $post);
+			$this->display($options);
 		}
 	}
 
@@ -41,6 +42,7 @@ class Controller {
 			'dbname' => '',
 			'dbtablespace' => '',
 			'dbhost' => '',
+			'dbtype' => '',
 		);
 		$parameters = array_merge($defaults, $post);
 
@@ -80,6 +82,13 @@ class Controller {
 		return $post;
 	}
 
+	/**
+	 * Gathers system information like database type and does
+	 * a few system checks.
+	 *
+	 * @return array of system info, including an "errors" value
+	 * in case of errors/warnings
+	 */
 	public function getSystemInfo() {
 		$hasSQLite = class_exists('SQLite3');
 		$hasMySQL = is_callable('mysql_connect');
@@ -122,6 +131,20 @@ class Controller {
 			$htaccessWorking = false;
 		}
 
+		if (\OC_Util::runningOnMac()) {
+			$l10n = \OC_L10N::get('core');
+			$themeName = \OC_Util::getTheme();
+			$theme = new \OC_Defaults();
+			$errors[] = array(
+				'error' => $l10n->t(
+					'Mac OS X is not supported and %s will not work properly on this platform. ' .
+					'Use it at your own risk! ',
+					$theme->getName()
+				),
+				'hint' => $l10n->t('For the best results, please consider using a GNU/Linux server instead.')
+			);
+		}
+
 		return array(
 			'hasSQLite' => $hasSQLite,
 			'hasMySQL' => $hasMySQL,
diff --git a/core/templates/installation.php b/core/templates/installation.php
index d9f3c38ab1..709207e797 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -84,7 +84,7 @@
 	<?php endif; ?>
 
 	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
-	<fieldset id='databaseField'>
+	<fieldset id='databaseBackend'>
 		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'] or $_['hasMSSQL'])
 			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
 		<legend><?php p($l->t( 'Configure the database' )); ?></legend>
@@ -95,13 +95,15 @@
 		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>" />
 		<?php else: ?>
 		<input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
-			<?php p($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/>
+			<?php print_unescaped($_['dbtype'] === $type ? 'checked="checked" ' : '') ?>/>
 		<label class="<?php p($type) ?>" for="<?php p($type) ?>"><?php p($label) ?></label>
 		<?php endif; ?>
 		<?php endforeach; ?>
 		</div>
+	</fieldset>
 
 		<?php if($hasOtherDB): ?>
+		<fieldset id='databaseField'>
 		<div id="use_other_db">
 			<p class="infield grouptop">
 				<label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label>
@@ -141,8 +143,8 @@
 					autocomplete="off" autocapitalize="off" autocorrect="off" />
 			</p>
 		</div>
+		</fieldset>
 		<?php endif; ?>
-	</fieldset>
 	<?php endif; ?>
 
 	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index bae52a7323..b3e2f4da91 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -31,7 +31,7 @@
 		<?php endforeach; ?>
 	</head>
 
-	<body>
+	<body id="body-public">
 		<?php print_unescaped($_['content']); ?>
 	</body>
 </html>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 91157b923a..5788d1d5bd 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -36,7 +36,7 @@
 	<body id="body-login">
 		<div class="wrapper"><!-- for sticky footer -->
 			<header><div id="header">
-				<div class='logo'></div>
+				<div class="logo svg"></div>
 				<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 			</div></header>
 
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 3d89750348..ba5f6ef9b5 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -15,7 +15,7 @@
 		</title>
 		<meta charset="utf-8">
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=1.0">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
 		<meta name="apple-itunes-app" content="app-id=543672169">
 		<link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" />
 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>" />
@@ -46,7 +46,7 @@
 	</div>
 	<header><div id="header">
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud">
-				<div class='logo-wide'></div>
+				<div class="logo-wide svg"></div>
 			</a>
 			<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 			<div id="settings" class="svg">
diff --git a/core/templates/mail.php b/core/templates/mail.php
index b8b0a2bfe9..ae46eaca78 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -2,15 +2,15 @@
 <tr><td>
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
 <tr>
-<td bgcolor="#1d2d44" width="20px">&nbsp;</td>
-<td bgcolor="#1d2d44">
-<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
+<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
+<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
+<img src="<?php p(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 </td>
 </tr>
-<tr><td bgcolor="#f8f8f8" colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2">&nbsp;</td></tr>
 <tr>
-<td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
-<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
+<td width="20px">&nbsp;</td>
+<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
 <?php
 print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link'])));
 if ( isset($_['expiration']) ) {
@@ -21,17 +21,17 @@ p($l->t('Cheers!'));
 ?>
 </td>
 </tr>
-<tr><td bgcolor="#f8f8f8" colspan="2">&nbsp;</td></tr>
+<tr><td colspan="2">&nbsp;</td></tr>
 <tr>
-<td bgcolor="#f8f8f8" width="20px">&nbsp;</td>
-<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
+<td width="20px">&nbsp;</td>
+<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 <?php p($theme->getName()); ?> -
 <?php p($theme->getSlogan()); ?>
-<br><a href="<?php print_unescaped($theme->getBaseUrl()); ?>"><?php print_unescaped($theme->getBaseUrl());?></a>
+<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
 </td>
 </tr>
 <tr>
-<td bgcolor="#f8f8f8" colspan="2">&nbsp;</td>
+<td colspan="2">&nbsp;</td>
 </tr>
 </table>
 </td></tr>
diff --git a/cron.php b/cron.php
index 44ca421328..8fa72a319c 100644
--- a/cron.php
+++ b/cron.php
@@ -48,7 +48,10 @@ try {
 
 	require_once 'lib/base.php';
 
-	session_write_close();
+	// load all apps to get all api routes properly setup
+	OC_App::loadApps();
+
+	\OC::$session->close();
 
 	$logger = \OC_Log::$object;
 
@@ -119,6 +122,10 @@ try {
 
 	// done!
 	TemporaryCronClass::$sent = true;
+	// Log the successfull cron exec
+	if (OC_Config::getValue('cron_log', true)) {
+		OC_Appconfig::setValue('core', 'lastcron', time());
+	}
 	exit();
 
 } catch (Exception $ex) {
diff --git a/index.php b/index.php
index 0a2f15f9f5..bd94d0e908 100755
--- a/index.php
+++ b/index.php
@@ -21,8 +21,6 @@
 *
 */
 
-$RUNTIME_NOAPPS = true; //no apps, yet
-
 try {
 	
 	require_once 'lib/base.php';
diff --git a/l10n/.tx/config b/l10n/.tx/config
index 70ec332856..ba2d192909 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -1,5 +1,6 @@
 [main]
-host = https://www.transifex.net
+host = https://www.transifex.com
+lang_map = ja_JP: ja
 
 [owncloud.core]
 file_filter = <lang>/core.po
diff --git a/l10n/ach/core.po b/l10n/ach/core.po
index 9808a0ee03..3640708d6e 100644
--- a/l10n/ach/core.po
+++ b/l10n/ach/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ach/files.po b/l10n/ach/files.po
index 169f2307c3..58c50d3e19 100644
--- a/l10n/ach/files.po
+++ b/l10n/ach/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ach/files_encryption.po b/l10n/ach/files_encryption.po
index 576cbab374..79790b6544 100644
--- a/l10n/ach/files_encryption.po
+++ b/l10n/ach/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/ach/files_external.po b/l10n/ach/files_external.po
index f3808f1199..777e81342e 100644
--- a/l10n/ach/files_external.po
+++ b/l10n/ach/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:453
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:457
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:460
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ach/files_sharing.po b/l10n/ach/files_sharing.po
index ed2a3de1d7..37a1f4ea88 100644
--- a/l10n/ach/files_sharing.po
+++ b/l10n/ach/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ach/files_trashbin.po b/l10n/ach/files_trashbin.po
index 1eeccfe967..96c38828dd 100644
--- a/l10n/ach/files_trashbin.po
+++ b/l10n/ach/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/ach/lib.po b/l10n/ach/lib.po
index 188f480eab..c338a1ca54 100644
--- a/l10n/ach/lib.po
+++ b/l10n/ach/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ach/settings.po b/l10n/ach/settings.po
index 8b891176d1..ebba9b1309 100644
--- a/l10n/ach/settings.po
+++ b/l10n/ach/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ach/user_ldap.po b/l10n/ach/user_ldap.po
index b4fe8bb261..8516b5a6fe 100644
--- a/l10n/ach/user_ldap.po
+++ b/l10n/ach/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ady/core.po b/l10n/ady/core.po
index 2176752235..a686756ba9 100644
--- a/l10n/ady/core.po
+++ b/l10n/ady/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ady/files.po b/l10n/ady/files.po
index 95bd2e10d1..bc32e0306b 100644
--- a/l10n/ady/files.po
+++ b/l10n/ady/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ady/files_encryption.po b/l10n/ady/files_encryption.po
index d36a8d8def..2ae790c338 100644
--- a/l10n/ady/files_encryption.po
+++ b/l10n/ady/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/ady/files_external.po b/l10n/ady/files_external.po
index 9715fc2bc0..c764d6453e 100644
--- a/l10n/ady/files_external.po
+++ b/l10n/ady/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-07 12:16-0400\n"
-"PO-Revision-Date: 2013-10-07 15:03+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:453
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:457
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:460
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ady/files_sharing.po b/l10n/ady/files_sharing.po
index c155c36bda..62d961f352 100644
--- a/l10n/ady/files_sharing.po
+++ b/l10n/ady/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ady/files_trashbin.po b/l10n/ady/files_trashbin.po
index c8916178f7..65927975a2 100644
--- a/l10n/ady/files_trashbin.po
+++ b/l10n/ady/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/ady/lib.po b/l10n/ady/lib.po
index 6043ba35ec..0a215aa358 100644
--- a/l10n/ady/lib.po
+++ b/l10n/ady/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ady/settings.po b/l10n/ady/settings.po
index 72191d8382..334e9c42e7 100644
--- a/l10n/ady/settings.po
+++ b/l10n/ady/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ady/user_ldap.po b/l10n/ady/user_ldap.po
index 9c99719138..705677146f 100644
--- a/l10n/ady/user_ldap.po
+++ b/l10n/ady/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/af/core.po b/l10n/af/core.po
index a93e058017..94d53b7357 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/af/files.po b/l10n/af/files.po
index b5cf6a2f4b..2175656e18 100644
--- a/l10n/af/files.po
+++ b/l10n/af/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/af/files_encryption.po b/l10n/af/files_encryption.po
index a8ac7007bd..6601d7dfb2 100644
--- a/l10n/af/files_encryption.po
+++ b/l10n/af/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/af/files_external.po b/l10n/af/files_external.po
index 12bc380c97..f3768b60b6 100644
--- a/l10n/af/files_external.po
+++ b/l10n/af/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-21 18:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:453
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:457
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:460
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/af/files_sharing.po b/l10n/af/files_sharing.po
index 1321de3642..15b99fb2ab 100644
--- a/l10n/af/files_sharing.po
+++ b/l10n/af/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-21 18:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/af/files_trashbin.po b/l10n/af/files_trashbin.po
index d5ff3ad381..2bc09ed034 100644
--- a/l10n/af/files_trashbin.po
+++ b/l10n/af/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-21 18:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/af/lib.po b/l10n/af/lib.po
index 8954006a8a..9567765edb 100644
--- a/l10n/af/lib.po
+++ b/l10n/af/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 542ebc1bb0..d312d89bbf 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/af/user_ldap.po b/l10n/af/user_ldap.po
index e9d0724a46..32c77bec4a 100644
--- a/l10n/af/user_ldap.po
+++ b/l10n/af/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/af_ZA/core.po b/l10n/af_ZA/core.po
index 618d4d305d..1edc5b40a1 100644
--- a/l10n/af_ZA/core.po
+++ b/l10n/af_ZA/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Instellings"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Wagwoord"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Gebruik die volgende skakel om jou wagwoord te herstel: {link}"
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Gebruikersnaam"
 
@@ -517,6 +533,18 @@ msgstr "Nuwe wagwoord"
 msgid "Reset password"
 msgstr "Herstel wagwoord"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Persoonlik"
@@ -525,7 +553,7 @@ msgstr "Persoonlik"
 msgid "Users"
 msgstr "Gebruikers"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Toepassings"
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skep `n <strong>admin-rekening</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Gevorderd"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Stel databasis op"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "sal gebruik word"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasis-gebruiker"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Databasis-wagwoord"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Databasis naam"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Maak opstelling klaar"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Teken uit"
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Jou wagwoord verloor?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "onthou"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Teken aan"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/af_ZA/files.po b/l10n/af_ZA/files.po
index c871aaa6c4..9ab990fa95 100644
--- a/l10n/af_ZA/files.po
+++ b/l10n/af_ZA/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/af_ZA/files_encryption.po b/l10n/af_ZA/files_encryption.po
index 926d021d25..ccf69021eb 100644
--- a/l10n/af_ZA/files_encryption.po
+++ b/l10n/af_ZA/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/af_ZA/files_external.po b/l10n/af_ZA/files_external.po
index 30a7d76922..11027ed978 100644
--- a/l10n/af_ZA/files_external.po
+++ b/l10n/af_ZA/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Gebruikers"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/af_ZA/files_sharing.po b/l10n/af_ZA/files_sharing.po
index 79ee323751..d2b21bc6a2 100644
--- a/l10n/af_ZA/files_sharing.po
+++ b/l10n/af_ZA/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/af_ZA/files_trashbin.po b/l10n/af_ZA/files_trashbin.po
index 4d4d4b186e..8fb4f5b930 100644
--- a/l10n/af_ZA/files_trashbin.po
+++ b/l10n/af_ZA/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/af_ZA/lib.po b/l10n/af_ZA/lib.po
index 7d0718c77d..6dcb6dbbdf 100644
--- a/l10n/af_ZA/lib.po
+++ b/l10n/af_ZA/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hulp"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Persoonlik"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Instellings"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Gebruikers"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "webdienste onder jou beheer"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/af_ZA/settings.po b/l10n/af_ZA/settings.po
index ea0e485d5c..92e777a3d5 100644
--- a/l10n/af_ZA/settings.po
+++ b/l10n/af_ZA/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: af_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Wagwoord"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nuwe wagwoord"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/af_ZA/user_ldap.po b/l10n/af_ZA/user_ldap.po
index ffa1923ad1..4f4ab64328 100644
--- a/l10n/af_ZA/user_ldap.po
+++ b/l10n/af_ZA/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Afrikaans (South Africa) (http://www.transifex.com/projects/p/owncloud/language/af_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "Hulp"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ak/core.po b/l10n/ak/core.po
index 71758432e2..f498dda78d 100644
--- a/l10n/ak/core.po
+++ b/l10n/ak/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-30 01:55-0500\n"
-"PO-Revision-Date: 2013-12-29 13:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ak/files.po b/l10n/ak/files.po
index 4544710bb3..639ada15a2 100644
--- a/l10n/ak/files.po
+++ b/l10n/ak/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-30 01:55-0500\n"
-"PO-Revision-Date: 2013-12-29 13:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ak/files_encryption.po b/l10n/ak/files_encryption.po
index b2b29d74f0..92710e5b5d 100644
--- a/l10n/ak/files_encryption.po
+++ b/l10n/ak/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-30 01:55-0500\n"
-"PO-Revision-Date: 2013-12-29 13:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:62
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:63
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:281
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/ak/files_external.po b/l10n/ak/files_external.po
index 95dcbe86db..7ee8bbb3a5 100644
--- a/l10n/ak/files_external.po
+++ b/l10n/ak/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-30 01:55-0500\n"
-"PO-Revision-Date: 2013-12-29 13:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:467
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:471
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:474
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ak/files_sharing.po b/l10n/ak/files_sharing.po
index da92ef7b37..6e19fe894d 100644
--- a/l10n/ak/files_sharing.po
+++ b/l10n/ak/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-30 01:55-0500\n"
-"PO-Revision-Date: 2013-12-29 13:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ak/files_trashbin.po b/l10n/ak/files_trashbin.po
index ee5c134734..56c75b3a35 100644
--- a/l10n/ak/files_trashbin.po
+++ b/l10n/ak/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-30 01:55-0500\n"
-"PO-Revision-Date: 2013-12-29 13:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,21 +17,25 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/ak/lib.po b/l10n/ak/lib.po
index 3778c524ce..2747783c02 100644
--- a/l10n/ak/lib.po
+++ b/l10n/ak/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-30 01:55-0500\n"
-"PO-Revision-Date: 2013-12-29 13:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,34 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: private/app.php:245
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:257
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:362
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:375
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:386
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:398
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:411
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ak/settings.po b/l10n/ak/settings.po
index 90a872fc26..cb7953cc98 100644
--- a/l10n/ak/settings.po
+++ b/l10n/ak/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-30 01:55-0500\n"
-"PO-Revision-Date: 2013-12-29 13:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ak/user_ldap.po b/l10n/ak/user_ldap.po
index 3e48b49899..537c7c79d0 100644
--- a/l10n/ak/user_ldap.po
+++ b/l10n/ak/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-30 01:55-0500\n"
-"PO-Revision-Date: 2013-12-29 13:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/am_ET/core.po b/l10n/am_ET/core.po
new file mode 100644
index 0000000000..7101e46cec
--- /dev/null
+++ b/l10n/am_ET/core.po
@@ -0,0 +1,801 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:36
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:41
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:42
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:47
+msgid "January"
+msgstr ""
+
+#: js/config.php:48
+msgid "February"
+msgstr ""
+
+#: js/config.php:49
+msgid "March"
+msgstr ""
+
+#: js/config.php:50
+msgid "April"
+msgstr ""
+
+#: js/config.php:51
+msgid "May"
+msgstr ""
+
+#: js/config.php:52
+msgid "June"
+msgstr ""
+
+#: js/config.php:53
+msgid "July"
+msgstr ""
+
+#: js/config.php:54
+msgid "August"
+msgstr ""
+
+#: js/config.php:55
+msgid "September"
+msgstr ""
+
+#: js/config.php:56
+msgid "October"
+msgstr ""
+
+#: js/config.php:57
+msgid "November"
+msgstr ""
+
+#: js/config.php:58
+msgid "December"
+msgstr ""
+
+#: js/js.js:458
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:996
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:997
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:998
+msgid "today"
+msgstr ""
+
+#: js/js.js:999
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1000
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1001
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1002
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1003
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:1004
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1005
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:767
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:171
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:178
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:188
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:190
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:214
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:220
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:223
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: js/share.js:230
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:234
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:235
+msgid "Send"
+msgstr ""
+
+#: js/share.js:240
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:241
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:277
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:280
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:324 js/share.js:363
+msgid "group"
+msgstr ""
+
+#: js/share.js:335
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:379
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:401
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:409
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:412
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:414
+msgid "access control"
+msgstr ""
+
+#: js/share.js:417
+msgid "create"
+msgstr ""
+
+#: js/share.js:420
+msgid "update"
+msgstr ""
+
+#: js/share.js:423
+msgid "delete"
+msgstr ""
+
+#: js/share.js:426
+msgid "share"
+msgstr ""
+
+#: js/share.js:698
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:711
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:729
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:754
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:765
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:789
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:8
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:7
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation.  "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/am_ET/files.po b/l10n/am_ET/files.po
new file mode 100644
index 0000000000..e301286aee
--- /dev/null
+++ b/l10n/am_ET/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:98
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:119
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:156
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:78
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:79
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:81
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:84
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:85
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:103
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:160
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:477
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:564
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:568
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:570 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:636
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:652
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:702
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:121
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:134
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:138
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:142
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:379
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:610 js/files.js:654
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:610 js/files.js:654
+msgid "Error"
+msgstr ""
+
+#: js/files.js:672 templates/index.php:68
+msgid "Name"
+msgstr ""
+
+#: js/files.js:673 templates/index.php:80
+msgid "Size"
+msgstr ""
+
+#: js/files.js:674 templates/index.php:82
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
+msgstr ""
+
+#: lib/app.php:111
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:14 templates/index.php:23
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:6
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:13
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:17
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:52
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:74
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:85 templates/index.php:86
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:98
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:100
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:105
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:108
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/am_ET/files_encryption.po b/l10n/am_ET/files_encryption.po
new file mode 100644
index 0000000000..ee25cebfde
--- /dev/null
+++ b/l10n/am_ET/files_encryption.po
@@ -0,0 +1,201 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:295
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:7
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:11
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:40
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:47
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:58
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:12
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:22
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:28
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:33
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:42
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:44
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:61
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/am_ET/files_external.po b/l10n/am_ET/files_external.po
new file mode 100644
index 0000000000..a99ed6d50e
--- /dev/null
+++ b/l10n/am_ET/files_external.po
@@ -0,0 +1,127 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:631
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:635
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:638
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:155 templates/settings.php:156
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:127
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:147
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:165
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/am_ET/files_sharing.po b/l10n/am_ET/files_sharing.po
new file mode 100644
index 0000000000..5df40a5570
--- /dev/null
+++ b/l10n/am_ET/files_sharing.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:17
+#, php-format
+msgid "shared by %s"
+msgstr ""
+
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:48
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/am_ET/files_trashbin.po b/l10n/am_ET/files_trashbin.po
new file mode 100644
index 0000000000..5c0bf63448
--- /dev/null
+++ b/l10n/am_ET/files_trashbin.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:859 lib/trashbin.php:861
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:23 templates/index.php:25
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:31
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:34 templates/index.php:35
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:8
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/am_ET/files_versions.po b/l10n/am_ET/files_versions.po
new file mode 100644
index 0000000000..63482f6805
--- /dev/null
+++ b/l10n/am_ET/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:14
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:60
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:87
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:125
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:155
+msgid "Restore"
+msgstr ""
diff --git a/l10n/am_ET/lib.po b/l10n/am_ET/lib.po
new file mode 100644
index 0000000000..0bec5cd684
--- /dev/null
+++ b/l10n/am_ET/lib.po
@@ -0,0 +1,338 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:875
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:231
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:232
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:233 private/files.php:261
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:258
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:259
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:63 private/json.php:88
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:52
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: private/setup/mssql.php:21 private/setup/mysql.php:13
+#: 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 ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: 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: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 ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: 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: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 ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:202
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:203
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:133
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:135
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:137
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:139
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:141
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:142
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:144
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:145
+msgid "years ago"
+msgstr ""
diff --git a/l10n/am_ET/settings.po b/l10n/am_ET/settings.po
new file mode 100644
index 0000000000..f2886d1023
--- /dev/null
+++ b/l10n/am_ET/settings.po
@@ -0,0 +1,824 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:54
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:246
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:49 personal.php:50
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
+
+#: 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 "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Setup Warning"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:90
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:104
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:118
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:123
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:127
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:143
+msgid "Internet connection not working"
+msgstr ""
+
+#: 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 "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:192
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:200
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:205
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:219
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:228
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:243
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:246
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:254
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:261
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:274
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:276
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:282
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:377
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:416 templates/personal.php:181
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:420 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\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:37
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:50
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:64 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:81
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:83
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:101
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:103
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:107
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:112
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:120 templates/personal.php:121
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:147
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:149
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:167
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:172
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/am_ET/user_ldap.po b/l10n/am_ET/user_ldap.po
new file mode 100644
index 0000000000..df272f6978
--- /dev/null
+++ b/l10n/am_ET/user_ldap.po
@@ -0,0 +1,523 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:838
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:847
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:856
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:873 js/settings.js:882
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:876 js/settings.js:885
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:879
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:906
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:913
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:922
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:923
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:79 lib/wizard.php:93
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:122
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:784 lib/wizard.php:796
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:963
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:14
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:52
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:53
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:54
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:56
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:57
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:60
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/am_ET/user_webdavauth.po b/l10n/am_ET/user_webdavauth.po
new file mode 100644
index 0000000000..effb19c169
--- /dev/null
+++ b/l10n/am_ET/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 09:38+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: am_ET\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 5cc97810f1..b31f677213 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Abderraouf Mehdi Bouhali <armbouhali@gmail.com>, 2014
 # blackcoder <tarek.taha@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-25 01:55-0400\n"
+"PO-Revision-Date: 2014-03-24 14:00+0000\n"
+"Last-Translator: Abderraouf Mehdi Bouhali <armbouhali@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"
@@ -18,12 +19,11 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,30 +40,17 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
-msgstr ""
+msgstr "نوع الملف غير معروف"
 
 #: avatar/controller.php:85
 msgid "Invalid image"
-msgstr ""
+msgstr "الصورة غير صالحة"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
@@ -73,91 +60,95 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
-msgstr "الاحد"
+msgstr "الأحد"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "الأثنين"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "الثلاثاء"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "الاربعاء"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "الخميس"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "الجمعه"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "السبت"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "كانون الثاني"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "شباط"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "آذار"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "نيسان"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "أيار"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "حزيران"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "تموز"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "آب"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "أيلول"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "تشرين الاول"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "تشرين الثاني"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "كانون الاول"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "إعدادات"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "جاري الحفظ..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -167,7 +158,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -177,15 +168,15 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "اليوم"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -195,11 +186,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -209,15 +200,15 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "شهر مضى"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "سنة مضت"
 
@@ -289,6 +280,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "كلمة السر ضعيفة جدا"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "كلمة السر ضعيفة"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "كلمة السر جيدة"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "كلمة السر قوية"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "مشارك"
@@ -297,12 +308,12 @@ msgstr "مشارك"
 msgid "Share"
 msgstr "شارك"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "خطأ"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "حصل خطأ عند عملية المشاركة"
 
@@ -314,123 +325,123 @@ msgstr "حصل خطأ عند عملية إزالة المشاركة"
 msgid "Error while changing permissions"
 msgstr "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "شورك معك ومع المجموعة {group} من قبل {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "شورك معك من قبل {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
-msgstr ""
+msgstr "شارك الرابط"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "حماية كلمة السر"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "كلمة المرور"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "ارسل الرابط بالبريد الى صديق"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "أرسل"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "مشاركة عبر البريد الإلكتروني:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "لم يتم العثور على أي شخص"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "مجموعة"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "لا يسمح بعملية إعادة المشاركة"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "شورك في {item} مع {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "التحرير مسموح"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "ضبط الوصول"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "إنشاء"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "تحديث"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "حذف"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "مشاركة"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "محمي بكلمة السر"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "جاري الارسال ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "تم ارسال البريد الالكتروني"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "تحذير"
 
@@ -477,9 +488,15 @@ msgstr "حصل خطأ في عملية التحديث, يرجى ارسال تقر
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud"
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
+msgstr "تمت إعادة ضبط كلمة مرور %s"
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -501,8 +518,8 @@ msgstr "الطلب رفض! <br> هل انت متأكد أن الاسم/العن
 msgid "You will receive a link to reset your password via Email."
 msgstr "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "إسم المستخدم"
 
@@ -516,7 +533,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "نعم، أريد إعادة ضبظ كلمة مروري"
 
 #: lostpassword/templates/lostpassword.php:30
 msgid "Reset"
@@ -538,6 +555,18 @@ msgstr "كلمات سر جديدة"
 msgid "Reset password"
 msgstr "تعديل كلمة السر"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "شخصي"
@@ -546,7 +575,7 @@ msgstr "شخصي"
 msgid "Users"
 msgstr "المستخدمين"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "التطبيقات"
 
@@ -625,7 +654,7 @@ msgstr "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
 #: templates/installation.php:27
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "يرجى تحديث نسخة PHP لاستخدام %s بطريقة آمنة"
 
 #: templates/installation.php:33
 msgid ""
@@ -650,55 +679,53 @@ msgstr "مجلدات البيانات والملفات الخاصة قد تكو
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>."
 
 #: templates/installation.php:48
 msgid "Create an <strong>admin account</strong>"
 msgstr "أضف </strong>مستخدم رئيسي <strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "تعديلات متقدمه"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "مجلد المعلومات"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "أسس قاعدة البيانات"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "سيتم استخدمه"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "مستخدم قاعدة البيانات"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "كلمة سر مستخدم قاعدة البيانات"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "إسم قاعدة البيانات"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "مساحة جدول قاعدة البيانات"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "خادم قاعدة البيانات"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -714,7 +741,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "الخروج"
 
@@ -740,27 +767,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "هل نسيت كلمة السر؟"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "تذكر"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "أدخل"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "اسماء دخول بديلة"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 90e0850957..03c7ac1650 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,202 +19,215 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "فشل في نقل %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "اسم الملف لا يجوز أن يكون فارغا"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها"
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "غير قادر على تحميل المجلد"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "علامة غير صالحة"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "لم يتم رفع أي ملف , خطأ غير معروف"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "تم ترفيع الملفات بنجاح."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "حجم الملف المرفوع تجاوز قيمة  upload_max_filesize الموجودة في ملف php.ini "
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "لم يتم ترفيع أي من الملفات"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "المجلد المؤقت غير موجود"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "خطأ في الكتابة على القرص الصلب"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "لا يوجد مساحة تخزينية كافية"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "فشلت عملية الرفع. تعذر الحصول على معلومات الملف."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "*فشلت علمية الرفع. تعذر إيجاد الملف الذي تم رفعه.\n*فشلت علمية التحميل. تعذر إيجاد الملف الذي تم تحميله."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "فشلت عملية الرفع. تعذر الحصول على معلومات الملف."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "مسار غير صحيح."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "الملفات"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "لا توجد مساحة كافية"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "تم إلغاء عملية رفع الملفات ."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "تعذر الحصول على نتيجة من الخادم"
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} موجود مسبقا"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "شارك"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "حذف بشكل دائم"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "إعادة تسميه"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "قيد الانتظار"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "استبدل {new_name}  بـ  {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "تراجع"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "لا يوجد مجلدات %n"
@@ -224,7 +237,7 @@ msgstr[3] "عدد قليل من مجلدات %n"
 msgstr[4] "عدد كبير من مجلدات %n"
 msgstr[5] "مجلدات %n"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "لا يوجد ملفات %n"
@@ -234,11 +247,11 @@ msgstr[3] "قليل من ملفات %n"
 msgstr[4] "الكثير من ملفات %n"
 msgstr[5] " ملفات %n"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} و {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "لا يوجد ملفات %n لتحميلها"
@@ -248,66 +261,60 @@ msgstr[3] "يتم تحميل عدد قليل من ملفات %n"
 msgstr[4] "يتم تحميل عدد كبير من ملفات %n"
 msgstr[5] "يتم تحميل ملفات %n"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "\".\" اسم ملف غير صحيح."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها"
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "مساحتك التخزينية امتلأت تقريبا "
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "جاري تجهيز عملية التحميل. قد تستغرق بعض الوقت اذا كان حجم الملفات كبير."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "حدث خطأ أثناء نقل الملف"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "خطأ"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "اسم"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "معدل"
 
@@ -315,12 +322,12 @@ msgstr "معدل"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s  لا يمكن إعادة تسميته. "
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "رفع"
 
@@ -356,72 +363,68 @@ msgstr "الحد الأقصى المسموح به لملفات ZIP"
 msgid "Save"
 msgstr "حفظ"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "جديد"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "ملف"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
-msgstr ""
+msgstr "مجلد جديد"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "مجلد"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "من رابط"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "حذف الملفات"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "إلغاء رفع الملفات"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "إلغاء"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "حجم الترفيع أعلى من المسموح"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "يرجى الانتظار , جاري فحص الملفات ."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "الفحص الحالي"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "تحديث ذاكرة التخزين المؤقت(الكاش)  الخاصة بملفات النظام ..."
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index db77c258f9..570282efb9 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -3,13 +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: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-19 06:00+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"
@@ -19,46 +21,46 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "تم بنجاح تفعيل مفتاح الاستعادة"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "لا يمكن تفعيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "تم تعطيل مفتاح الاستعادة بنجاح"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "تم تغيير كلمة المرور بنجاح."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة."
 
 #: ajax/updatePrivateKeyPassword.php:52
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "تم تحديث كلمة المرور للمفتاح الخاص بنجاح."
 
 #: ajax/updatePrivateKeyPassword.php:54
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "لا يمكن تحديث كلمة مرور المفتاح الخاص. من الممكن ان كلمة المرور القديمة غير صحيحة."
 
 #: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "برنامج التشفير لم يتم تهيئتة ! من الممكن ان برنامج التشفير تم اعادة تفعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشفير."
 
 #: files/error.php:16
 #, php-format
@@ -66,50 +68,50 @@ msgid ""
 "Your private key is not valid! Likely your password was changed outside of "
 "%s (e.g. your corporate directory). You can update your private key password"
 " in your personal settings to recover access to your encrypted files."
-msgstr ""
+msgstr "مفتاحك الخاص غير صالح! ربما تم تغيير كلمة المرور خارج %s (مثل:مجلد شركتك). يمكنك تحديث كلمة المرور في الاعدادات الشخصية لإستعادة الوصول الى ملفاتك المشفرة."
 
 #: files/error.php:19
 msgid ""
 "Can not decrypt this file, probably this is a shared file. Please ask the "
 "file owner to reshare the file with you."
-msgstr ""
+msgstr "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك."
 
 #: files/error.php:22 files/error.php:27
 msgid ""
 "Unknown error please check your system settings or contact your "
 "administrator"
-msgstr ""
+msgstr "خطا غير معروف يرجى التاكد من اعدادات نظامك او تواصل مع المدير."
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
-msgstr ""
+msgstr "متطلبات ناقصة."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
-msgstr ""
+msgstr "يرجى التاكد من ان اصدار PHP 5.3.3 او احدث , مثبت و التاكد من ان OpenSSL مفعل و مهيئ بشكل صحيح. حتى الان برنامج التتشفير تم تعطيلة."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "المستخدمين التاليين لم يتم تعيين لهم التشفيير:"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "بدأ التشفير... من الممكن ان ياخذ بعض الوقت. يرجى الانتظار."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "جاري الحفظ..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا"
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "انتقل مباشرة الى "
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
-msgstr ""
+msgstr "اعدادات شخصية"
 
 #: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
@@ -118,84 +120,84 @@ msgstr "التشفير"
 #: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "تفعيل استعادة المفتاح (سوف يمكنك من استعادة ملفات المستخدمين في حال فقدان كلمة المرور):"
 
 #: templates/settings-admin.php:11
 msgid "Recovery key password"
-msgstr ""
+msgstr "استعادة كلمة مرور المفتاح"
 
 #: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "كرر كلمة المرور لـ استعادة المفتاح"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
-msgstr ""
+msgstr "مفعلة"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
-msgstr ""
+msgstr "معطلة"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "تعديل كلمة المرور استعادة المفتاح:"
 
 #: templates/settings-admin.php:40
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "كلمة المرور القديمة لـ استعامة المفتاح"
 
 #: templates/settings-admin.php:47
 msgid "New Recovery key password"
-msgstr ""
+msgstr "تعيين كلمة مرور جديدة لـ استعادة المفتاح"
 
 #: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "كرر كلمة المرور لـ استعادة المفتاح من جديد"
 
 #: templates/settings-admin.php:58
 msgid "Change Password"
-msgstr ""
+msgstr "عدل كلمة السر"
 
 #: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "كلمة مرور مفتاحك الخاص لا تتطابق مع كلمة المرور الخاصة الدخول:"
 
 #: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "تعيين كلمة المرور القديمة لـ المفتاح الخاص الى كلمة المرور الخاصة بالدخول الحالية."
 
 #: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "اذا كنت لاتتذكر كلمة السر تستطيع ان تطلب من المدير ان يستعيد ملفاتك."
 
 #: templates/settings-personal.php:22
 msgid "Old log-in password"
-msgstr ""
+msgstr "كلمة المرور القديمة الخاصة بالدخول"
 
 #: templates/settings-personal.php:28
 msgid "Current log-in password"
-msgstr ""
+msgstr "كلمة المرور الحالية الخاصة بالدخول"
 
 #: templates/settings-personal.php:33
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "تحديث كلمة المرور لـ المفتاح الخاص"
 
 #: templates/settings-personal.php:42
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "تفعيل استعادة كلمة المرور:"
 
 #: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور"
 
 #: templates/settings-personal.php:60
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "اعدادات ملف الاستعادة تم تحديثه"
 
 #: templates/settings-personal.php:61
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "تعذر تحديث ملف الاستعادة"
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index e3eb7cc257..cc51765eb2 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 11:40+0000\n"
-"Last-Translator: Meesh <M_almohimeed@yahoo.com>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-19 06: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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "حفظ"
+
+#: lib/config.php:518
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:522
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:525
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "المستخدمين"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "إلغاء"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 1c6d266c54..103ad5d237 100644
--- a/l10n/ar/files_sharing.po
+++ b/l10n/ar/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Abderraouf Mehdi Bouhali <armbouhali@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-24 01:55-0400\n"
+"PO-Revision-Date: 2014-03-23 11:30+0000\n"
+"Last-Translator: Abderraouf Mehdi Bouhali <armbouhali@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"
@@ -17,13 +18,17 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "مشاركة من طرف {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
-msgstr ""
+msgstr "هذه المشاركة محمية بكلمة مرور"
 
 #: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
-msgstr ""
+msgstr "كلمة المرور خاطئة. حاول مرة أخرى"
 
 #: templates/authenticate.php:10
 msgid "Password"
@@ -31,54 +36,38 @@ msgstr "كلمة المرور"
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "عذرا، يبدو أن هذا الرابط لم يعد يعمل."
 
 #: templates/part.404.php:4
 msgid "Reasons might be:"
-msgstr ""
+msgstr "الأسباب الممكنة :"
 
 #: templates/part.404.php:6
 msgid "the item was removed"
-msgstr ""
+msgstr "تم حذف العنصر المطلوب"
 
 #: templates/part.404.php:7
 msgid "the link expired"
-msgstr ""
+msgstr "انتهت صلاحية الرابط"
 
 #: templates/part.404.php:8
 msgid "sharing is disabled"
-msgstr ""
+msgstr "المشاركة غير مفعلة"
 
 #: templates/part.404.php:10
 msgid "For more info, please ask the person who sent this link."
-msgstr ""
+msgstr "لمزيد من المعلومات، يرجى سؤال الشخص الذي أرسل هذا الرابط"
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s شارك المجلد %s معك"
+msgid "shared by %s"
+msgstr "مشاركة من قبل %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s شارك الملف %s معك"
+msgid "Download %s"
+msgstr "تحميل %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "تحميل"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "رفع"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "إلغاء رفع الملفات"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "لا يوجد عرض مسبق لـ"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
-msgstr ""
+msgstr "رابط مباشر"
diff --git a/l10n/ar/files_trashbin.po b/l10n/ar/files_trashbin.po
index bcd9ab3f53..e354e3194c 100644
--- a/l10n/ar/files_trashbin.po
+++ b/l10n/ar/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Abderraouf Mehdi Bouhali <armbouhali@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:10+0000\n"
+"Last-Translator: Abderraouf Mehdi Bouhali <armbouhali@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"
@@ -17,44 +18,48 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "تعذّر حذف%s بشكل دائم"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "تعذّر استرجاع %s "
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "حذف الملفات"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "خطأ"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:859 lib/trashbin.php:861
 msgid "restored"
-msgstr ""
+msgstr "تمت الاستعادة"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "لا يوجد شيء هنا. سلة المهملات خاليه."
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "اسم"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "استعيد"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "تم الحذف"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "إلغاء"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "الملفات المحذوفه"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 1bbf18cbd7..e86849ce2b 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Abderraouf Mehdi Bouhali <armbouhali@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: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-24 01:55-0400\n"
+"PO-Revision-Date: 2014-03-23 13:40+0000\n"
+"Last-Translator: Abderraouf Mehdi Bouhali <armbouhali@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"
@@ -17,59 +19,54 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "برنامج \"%s\" لا يمكن تثبيته بسبب انه لا يتناسب مع الاصدار الخاص بـ ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
-msgstr ""
+msgstr "لا يوجد برنامج بهذا الاسم"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "المساعدة"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "شخصي"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "إعدادات"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "المستخدمين"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "المدير"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "خطا في ترقية \"%s\"."
 
 #: private/avatar.php:66
 msgid "Unknown filetype"
-msgstr ""
+msgstr "نوع الملف غير معروف"
 
 #: private/avatar.php:71
 msgid "Invalid image"
-msgstr ""
+msgstr "الصورة غير صالحة"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "خدمات الشبكة تحت سيطرتك"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "تحميل ملفات ZIP متوقف"
@@ -92,74 +89,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "لم يتم تحديد المصدر عن تثبيت البرنامج"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "الأرشيفات من نوع  %s غير مدعومة"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "التطبيق لا يتوفر على ملف info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
-msgstr ""
+msgstr "مجلد التطبيق موجود مسبقا"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "لا يمكن إنشاء مجلد التطبيق. يرجى تعديل الصلاحيات. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "التطبيق غير مفعّل"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "لم يتم التأكد من الشخصية بنجاح"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "انتهت صلاحية الكلمة , يرجى اعادة تحميل الصفحة"
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "المستخدم غير معروف"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "الملفات"
@@ -193,23 +194,23 @@ 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 "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "اسم المستخدم  و/أو  كلمة المرور لنظام MySQL غير صحيح"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "اسم مستخدم أو كلمة مرور MySQL/MariaDB  غير صحيحين"
 
 #: 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 "خطأ في قواعد البيانات : \"%s\""
@@ -218,34 +219,34 @@ 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\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "أسم المستخدم  '%s'@'localhost' الخاص بـ MySQL موجود مسبقا"
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "مستخدم MySQL/MariaDB '%s'@'localhost' موجود مسبقا"
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "احذف اسم المستخدم هذا من الـ MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "أسم المستخدم  '%s'@'%%' الخاص بـ MySQL موجود مسبقا"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "احذف اسم المستخدم هذا من الـ MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "حذف هذا المستخدم من MySQL/MariaDB"
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "لم تنجح محاولة اتصال Oracle"
 
 #: private/setup/oci.php:41 private/setup/oci.php:113
 msgid "Oracle username and/or password not valid"
@@ -256,7 +257,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 غير صحيحة"
 
@@ -268,27 +269,33 @@ msgstr "اعداد اسم مستخدم للمدير"
 msgid "Set an admin password."
 msgstr "اعداد كلمة مرور للمدير"
 
-#: private/setup.php:195
+#: private/setup.php:202
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة"
 
-#: private/setup.php:196
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s شارك »%s« معك"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "تعذر العثور على المجلد \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "منذ ثواني"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -298,7 +305,7 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -308,15 +315,15 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "اليوم"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "يوم أمس"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -326,11 +333,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "الشهر الماضي"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -340,10 +347,10 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "السنةالماضية"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "سنة مضت"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 1b5b893cc8..6e6dd969c6 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -3,13 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ezidan <ezidan@live.com>, 2014
+# 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: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +20,48 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "ادخال خاطئ لقيمة %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "حفظ"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "إعدادات البريد التجريبي"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني"
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "حدث خطأ اثناء ارسال البريد الالكتروني ، الرجاء مراجعة اعداداتك"
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "تم ارسال البريد الالكتروني"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "وضعية الإرسال"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "التشفير"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "أسلوب التطابق"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "فشل تحميل القائمة من الآب ستور"
@@ -28,11 +73,11 @@ msgstr "لم يتم التأكد من الشخصية بنجاح"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
-msgstr ""
+msgstr "اسمك الكامل تم تغييره."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change full name"
-msgstr ""
+msgstr "لم يتم التمكن من تغيير اسمك الكامل"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -86,88 +131,116 @@ msgstr "تعذر تحديث التطبيق."
 
 #: changepassword/controller.php:20
 msgid "Wrong password"
-msgstr ""
+msgstr "كلمة مرور خاطئة"
 
 #: changepassword/controller.php:42
 msgid "No user supplied"
-msgstr ""
+msgstr "لم يتم توفير مستخدم "
 
 #: changepassword/controller.php:74
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr ""
+msgstr "يرجى توفير كلمة مرور المسؤول المستردة, وإلا سيتم فقد جميع بيانات المستخدم "
 
 #: changepassword/controller.php:79
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
-msgstr ""
+msgstr "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى."
 
 #: changepassword/controller.php:87
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
-msgstr ""
+msgstr "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح."
 
 #: changepassword/controller.php:92 changepassword/controller.php:103
 msgid "Unable to change password"
+msgstr "لا يمكن تغيير كلمة المرور"
+
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "جاري الارسال ..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "كتاب توثيق المستخدم"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
 msgstr ""
 
-#: js/apps.js:43
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "تم التحديث الى "
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "إيقاف"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "تفعيل"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "الرجاء الانتظار ..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
-msgstr ""
+msgstr "خطا عند تعطيل البرنامج"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
-msgstr ""
+msgstr "خطا عند تفعيل البرنامج "
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "جاري التحديث ..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "حصل خطأ أثناء تحديث التطبيق"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "خطأ"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "حدث"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "تم التحديث بنجاح"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
+msgstr "اختر صورة الملف الشخصي "
+
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "كلمة السر ضعيفة جدا"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "كلمة السر ضعيفة"
+
+#: js/personal.js:279
+msgid "So-so password"
 msgstr ""
 
-#: js/personal.js:266
+#: js/personal.js:280
+msgid "Good password"
+msgstr "كلمة السر جيدة"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "كلمة السر قوية"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
-
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "جاري الحفظ..."
+msgstr "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت."
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,265 +254,349 @@ msgstr "تراجع"
 msgid "Unable to remove user"
 msgstr "تعذر حذف المستخدم"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "مجموعات"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "مدير المجموعة"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "إلغاء"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "اضافة مجموعة"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "يجب ادخال اسم مستخدم صحيح"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "حصل خطأ اثناء انشاء مستخدم"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "يجب ادخال كلمة مرور صحيحة"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
-msgstr ""
+msgstr "تحذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
 #: templates/admin.php:8
 msgid "Everything (fatal issues, errors, warnings, info, debug)"
-msgstr ""
+msgstr "كل شيء (مشاكل فادحة, اخطاء , تحذيرات , معلومات , تصحيح الاخطاء)"
 
 #: templates/admin.php:9
 msgid "Info, warnings, errors and fatal issues"
-msgstr ""
+msgstr "معلومات , تحذيرات , اخطاء , مشاكل فادحة "
 
 #: templates/admin.php:10
 msgid "Warnings, errors and fatal issues"
-msgstr ""
+msgstr "تحذيرات , اخطاء , مشاكل فادحة "
 
 #: templates/admin.php:11
 msgid "Errors and fatal issues"
-msgstr ""
+msgstr "اخطاء ومشاكل فادحة "
 
 #: templates/admin.php:12
 msgid "Fatal issues only"
+msgstr "مشاكل فادحة فقط "
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "لا شيء"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "تسجيل الدخول"
+
+#: templates/admin.php:18
+msgid "Plain"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "تحذير أمان"
 
-#: templates/admin.php:25
+#: 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 ""
+msgstr "انت تستخدم %s عن طريق HTTP . نحن نقترح باصرار ان تهيء الخادم ليتمكن من الوصول عن طريق HTTPS."
 
-#: templates/admin.php:39
+#: 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 "
 "configure your webserver in a way that the data directory is no longer "
 "accessible or you move the data directory outside the webserver document "
 "root."
-msgstr ""
+msgstr "مجلد data و ملفاتك يمكن الوصول لها عن طريق الانترنت. ملف .htaccess لا يمكن تشغيلة. نحن نقترح باصرار ان تعيد اعداد خادمك لمنع الدخول الى بياناتك عن طريق الانترنت او بالامكان ان تنقل مجلد data خارج document root بشكل مؤقت. "
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "تحذير في التنصيب"
 
-#: templates/admin.php:53
+#: 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:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "يرجى التحقق <a href=\"%s\">دليل التثبيت</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "الموديل 'fileinfo' مفقود"
 
-#: templates/admin.php:68
+#: 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:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
-msgstr ""
+msgstr "اصدار PHP الخاص بك قديم"
 
-#: templates/admin.php:82
+#: 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 ""
+msgstr "اصدار PHP الخاص بك قديم. نحن نقترح لك باصرار ان يتم ترقية الاصدار الى  5.3.8 او احدث بسبب ان الاصدارات القديمة معروفة انها مهمشة. من الممكن ان التنزيل قد لا يتم بصورة صحيحة."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "اللغه لا تعمل"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
-msgstr ""
+msgstr "لا يمكن تعيين لغة النظام الى احد اللغات التي تدعم UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
-msgstr ""
+msgstr "هذا يعني انه من الممكن ان يكون هناك مشكلة في بعض الاحرف في اسم الملف."
 
-#: templates/admin.php:106
+#: 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 ""
+msgstr "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "الاتصال بالانترنت لا يعمل"
 
-#: templates/admin.php:121
+#: 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 "
 "installation of 3rd party apps don´t work. Accessing files from remote and "
 "sending of notification emails might also not work. We suggest to enable "
 "internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التحديثات او تنزيلات برامج الطرف الثالث3  لا تعمل. الدخول للملفات البعيدة و ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. نحن نقترح بتفعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستفادة من كل الميزات"
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "مجدول"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "قم بتنفيذ مهمة واحدة مع كل صفحة تم تحميلها"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
-msgstr ""
+msgstr "الملف cron.php تم تسجيله فى خدمه webcron  لاستدعاء الملف cron.php كل  15 دقيقه"
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr ""
+msgstr "استخدم نظام خدمة cron لـ استدعاء ملف cron.php كل 15 دقيقة "
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "مشاركة"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "السماح بالمشاركة عن طريق الAPI "
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "السماح للتطبيقات بالمشاركة عن طريق الAPI"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "السماح بالعناوين"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط "
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
-msgstr ""
+msgstr "السماح بالرفع للعامة "
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "السماح للمستخدمين بتفعيل الرفع للاخرين من خلال مجلد المشاركة العام "
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "السماح بإعادة المشاركة "
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "السماح للمستعملين بإعادة المشاركة مع أي أحد  "
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
-msgstr ""
+msgstr "السماح بتنبيهات البريد الالكتروني."
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "السماح للمستخدم الى ارسال تنبيه البريد الالكتروني للملفات المشتركة "
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "حماية"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "فرض HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر"
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, 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:294
+msgid "Email Server"
+msgstr "خادم البريد الالكتروني"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "عنوان الخادم"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "المنفذ"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "سجل"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "مستوى السجل"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "المزيد"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "أقل"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "إصدار"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +606,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "أضف تطبيقاتك"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "المزيد من التطبيقات"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "إختر تطبيقاً"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "التوثيق"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "راجع صفحة التطبيق على apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ترخيص من قبل <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "كتاب توثيق المستخدم"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "كتاب توثيق المدير"
@@ -506,7 +667,7 @@ msgstr "ابدأ خطوات بداية التشغيل من جديد"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "كلمة المرور"
 
@@ -518,151 +679,149 @@ msgstr "لقد تم تغيير كلمة السر"
 msgid "Unable to change your password"
 msgstr "لم يتم تعديل كلمة السر بنجاح"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "كلمات السر الحالية"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "كلمات سر جديدة"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "عدل كلمة السر"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
-msgstr ""
+msgstr "اسمك الكامل"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "البريد الإلكترونى"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "عنوانك البريدي"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
-msgstr ""
-
-#: templates/personal.php:91
-msgid "Upload new"
-msgstr ""
-
-#: templates/personal.php:93
-msgid "Select new from Files"
-msgstr ""
-
-#: templates/personal.php:94
-msgid "Remove image"
-msgstr ""
-
-#: templates/personal.php:95
-msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
-
-#: templates/personal.php:97
-msgid "Your avatar is provided by your original account."
-msgstr ""
+msgstr "صورة الملف الشخصي"
 
 #: templates/personal.php:101
-msgid "Abort"
-msgstr "إلغاء."
+msgid "Upload new"
+msgstr "رفع الان"
 
-#: templates/personal.php:102
+#: templates/personal.php:103
+msgid "Select new from Files"
+msgstr "اختر جديد من الملفات "
+
+#: templates/personal.php:104
+msgid "Remove image"
+msgstr "احذف الصورة "
+
+#: templates/personal.php:105
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "سواء png او jpg. بامكانك قص الصورة "
+
+#: templates/personal.php:107
+msgid "Your avatar is provided by your original account."
+msgstr "صورتك الرمزية يتم توفيرها عن طريق حسابك الاصلي."
+
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "الغاء"
+
+#: templates/personal.php:112
 msgid "Choose as profile image"
-msgstr ""
+msgstr "اختر صورة الملف الشخصي"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "اللغة"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "ساعد في الترجمه"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
-msgstr ""
+msgstr "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "التشفير"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr ""
+msgstr "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
-msgstr ""
+msgstr "كلمه سر الدخول"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
-msgstr ""
+msgstr "فك تشفير جميع الملفات "
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "اسم الدخول"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "انشئ"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "استعادة كلمة المرور للمسؤول"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "وحدة التخزين الافتراضية"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
-msgstr ""
+msgstr "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "غير محدود"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "شيء آخر"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "إسم المستخدم"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "وحدة التخزين"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
-msgstr ""
+msgstr "تغيير اسمك الكامل"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "اعداد كلمة مرور جديدة"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "افتراضي"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 3afffadb9e..a4e3832904 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# m.shehab <shehab.mahmood@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+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"
@@ -23,11 +24,11 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "تعذر حذف ملف إعدادات الخادم"
 
 #: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
-msgstr ""
+msgstr "الإعدادت صحيحة"
 
 #: ajax/testConfiguration.php:42
 msgid ""
@@ -80,49 +81,49 @@ msgstr ""
 
 #: js/settings.js:128
 msgid "Success"
-msgstr ""
+msgstr "نجاح"
 
 #: js/settings.js:133
 msgid "Error"
 msgstr "خطأ"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "إختر مجموعة"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -148,11 +149,11 @@ msgstr[3] ""
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -170,7 +171,7 @@ msgstr "المساعدة"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -206,7 +207,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -243,7 +244,7 @@ msgstr ""
 
 #: templates/part.wizard-server.php:36
 msgid "Port"
-msgstr ""
+msgstr "المنفذ"
 
 #: templates/part.wizard-server.php:44
 msgid "User DN"
@@ -274,7 +275,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -417,41 +418,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
-msgid "Email Field"
-msgstr ""
-
 #: templates/settings.php:45
+msgid "Email Field"
+msgstr "خانة البريد الإلكتروني"
+
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -467,15 +478,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +497,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +523,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/az/core.po b/l10n/az/core.po
index 2b88a23c46..d27ed545d6 100644
--- a/l10n/az/core.po
+++ b/l10n/az/core.po
@@ -7,22 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-09 06:39-0500\n"
-"PO-Revision-Date: 2013-12-09 11:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: az\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,131 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -228,6 +222,7 @@ msgstr ""
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
 msgstr[0] ""
+msgstr[1] ""
 
 #: js/oc-dialogs.js:361
 msgid "One file conflict"
@@ -263,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -271,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -288,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -451,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -475,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -512,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -520,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -630,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -714,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/az/files.po b/l10n/az/files.po
index 75cfc77660..907c50809c 100644
--- a/l10n/az/files.po
+++ b/l10n/az/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: az\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/move.php:17
 #, php-format
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,233 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
+msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -298,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -339,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/az/files_encryption.po b/l10n/az/files_encryption.po
index c145df966c..7bbae1590a 100644
--- a/l10n/az/files_encryption.po
+++ b/l10n/az/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-09 06:39-0500\n"
-"PO-Revision-Date: 2013-12-09 11:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:278
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/az/files_external.po b/l10n/az/files_external.po
index 020c2fbc41..d40759fe06 100644
--- a/l10n/az/files_external.po
+++ b/l10n/az/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-09 06:39-0500\n"
-"PO-Revision-Date: 2013-12-09 11:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:467
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:471
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:474
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/az/files_sharing.po b/l10n/az/files_sharing.po
index d4965ff837..4f0393ce9e 100644
--- a/l10n/az/files_sharing.po
+++ b/l10n/az/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-09 06:39-0500\n"
-"PO-Revision-Date: 2013-12-09 11:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/az/files_trashbin.po b/l10n/az/files_trashbin.po
index 539bb5a6f2..ebef2b8141 100644
--- a/l10n/az/files_trashbin.po
+++ b/l10n/az/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-09 06:39-0500\n"
-"PO-Revision-Date: 2013-12-09 11:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,21 +17,25 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
@@ -55,6 +59,6 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/az/lib.po b/l10n/az/lib.po
index 525d68a471..75015cb94c 100644
--- a/l10n/az/lib.po
+++ b/l10n/az/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,62 +267,68 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/az/settings.po b/l10n/az/settings.po
index e54d4e5a61..b43ce968a4 100644
--- a/l10n/az/settings.po
+++ b/l10n/az/settings.po
@@ -7,15 +7,57 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-09 06:39-0500\n"
-"PO-Revision-Date: 2013-12-09 11:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: az\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
 
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/az/user_ldap.po b/l10n/az/user_ldap.po
index c3dc07d725..5aaa8ff5dc 100644
--- a/l10n/az/user_ldap.po
+++ b/l10n/az/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-09 06:39-0500\n"
-"PO-Revision-Date: 2013-12-09 11:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/owncloud/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/be/core.po b/l10n/be/core.po
index 9e268cef6c..b654e238ac 100644
--- a/l10n/be/core.po
+++ b/l10n/be/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-06 01:55-0500\n"
-"PO-Revision-Date: 2014-01-05 17:20+0000\n"
-"Last-Translator: VladVaranetski <vlad.voronecky@gmail.com>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -73,91 +59,95 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Нядзеля"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Панядзелак"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Аўторак"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Серада"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Чацвер"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Пятніца"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Субота"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Студзень"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Люты"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Сакавік"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Красавік"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Май"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Чэрвень"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Ліпень"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Жнівень"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Верасень"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Кастрычнік"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Лістапад"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Снежань"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Налады"
 
-#: js/js.js:872
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "Секунд таму"
 
-#: js/js.js:873
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -165,7 +155,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:874
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -173,15 +163,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:875
+#: js/js.js:998
 msgid "today"
 msgstr "Сёння"
 
-#: js/js.js:876
+#: js/js.js:999
 msgid "yesterday"
 msgstr "Ўчора"
 
-#: js/js.js:877
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -189,11 +179,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:878
+#: js/js.js:1001
 msgid "last month"
 msgstr "У мінулым месяцы"
 
-#: js/js.js:879
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -201,15 +191,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:880
+#: js/js.js:1003
 msgid "months ago"
 msgstr "Месяцаў таму"
 
-#: js/js.js:881
+#: js/js.js:1004
 msgid "last year"
 msgstr "У мінулым годзе"
 
-#: js/js.js:882
+#: js/js.js:1005
 msgid "years ago"
 msgstr "Гадоў таму"
 
@@ -279,6 +269,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -287,12 +297,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Памылка"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -304,123 +314,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -467,11 +477,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -491,8 +507,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -528,6 +544,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -536,7 +564,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -646,49 +674,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Дасведчаны"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Завяршыць ўстаноўку."
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -704,7 +730,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -730,27 +756,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/be/files.po b/l10n/be/files.po
index 5dcc21e246..a2a5ebaa16 100644
--- a/l10n/be/files.po
+++ b/l10n/be/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-06 01:55-0500\n"
-"PO-Revision-Date: 2014-01-05 17:20+0000\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,155 +76,156 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -220,7 +233,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -228,11 +241,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -240,66 +253,60 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Памылка"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -307,12 +314,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -348,72 +355,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/be/files_encryption.po b/l10n/be/files_encryption.po
index da04152091..4cf8602735 100644
--- a/l10n/be/files_encryption.po
+++ b/l10n/be/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/be/files_external.po b/l10n/be/files_external.po
index c6f284fc40..acee78a711 100644
--- a/l10n/be/files_external.po
+++ b/l10n/be/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/be/files_sharing.po b/l10n/be/files_sharing.po
index a99536aced..fe99759a49 100644
--- a/l10n/be/files_sharing.po
+++ b/l10n/be/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/be/files_trashbin.po b/l10n/be/files_trashbin.po
index 91455c9670..f2257d6e56 100644
--- a/l10n/be/files_trashbin.po
+++ b/l10n/be/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-06 01:55-0500\n"
-"PO-Revision-Date: 2014-01-05 17:20+0000\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -17,21 +17,25 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Памылка"
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/be/lib.po b/l10n/be/lib.po
index a422c6e60f..d3648c9b69 100644
--- a/l10n/be/lib.po
+++ b/l10n/be/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-06 01:55-0500\n"
-"PO-Revision-Date: 2014-01-05 17:20+0000\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,34 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: private/app.php:245
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:257
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:362
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:375
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:386
+#: private/app.php:377
 msgid "Settings"
 msgstr "Налады"
 
-#: private/app.php:398
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:411
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,27 +267,33 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "Секунд таму"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -296,7 +301,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -304,15 +309,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "Сёння"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "Ўчора"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -320,11 +325,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "У мінулым месяцы"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -332,10 +337,10 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "У мінулым годзе"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "Гадоў таму"
diff --git a/l10n/be/settings.po b/l10n/be/settings.po
index fdb09c0a2b..1209b101c8 100644
--- a/l10n/be/settings.po
+++ b/l10n/be/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-06 01:55-0500\n"
-"PO-Revision-Date: 2014-01-05 17:20+0000\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Памылка"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/be/user_ldap.po b/l10n/be/user_ldap.po
index f9a186e2de..766cac335e 100644
--- a/l10n/be/user_ldap.po
+++ b/l10n/be/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-06 01:55-0500\n"
-"PO-Revision-Date: 2014-01-05 17:20+0000\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"
 "Language-Team: Belarusian (http://www.transifex.com/projects/p/owncloud/language/be/)\n"
 "MIME-Version: 1.0\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Памылка"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,11 +144,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -166,7 +166,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -202,7 +202,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -270,7 +270,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -413,41 +413,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -463,15 +473,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -482,19 +492,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -508,10 +518,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index f865e5452d..ca776f7ede 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# cybertorture, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-25 01:55-0400\n"
+"PO-Revision-Date: 2014-03-24 08:40+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +18,11 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,141 +59,145 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Неделя"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Понеделник"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Сряда"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Петък"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Събота"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Януари"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Февруари"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Април"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Май"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Юни"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Юли"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Септември"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Октомври"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Ноември"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Записване..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "днес"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "последният месец"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
-msgstr ""
+msgstr "Преди месеци"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "последната година"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "последните години"
 
 #: js/oc-dialogs.js:123
 msgid "Choose"
-msgstr ""
+msgstr "Избери"
 
 #: js/oc-dialogs.js:146
 msgid "Error loading file picker template: {error}"
@@ -268,154 +259,174 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
-msgstr ""
+msgstr "Споделено"
 
 #: js/share.js:109
 msgid "Share"
 msgstr "Споделяне"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
-msgstr ""
+msgstr "Грешка при споделяне"
 
 #: js/share.js:171
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Грепка докато се премахва споделянето"
 
 #: js/share.js:178
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Грешка при промяна на достъпност"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Споделено с тебе и група {group} от {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Споделено с тебе от {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
-msgstr ""
+msgstr "Защитено с парола"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Парола"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
-msgid "Email link to person"
-msgstr ""
-
 #: js/share.js:234
-msgid "Send"
-msgstr ""
+msgid "Email link to person"
+msgstr "Изпрати връзка до пощата на някои"
 
-#: js/share.js:239
-msgid "Set expiration date"
-msgstr ""
+#: js/share.js:235
+msgid "Send"
+msgstr "Изпрати"
 
 #: js/share.js:240
+msgid "Set expiration date"
+msgstr "Посочи дата на изтичане"
+
+#: js/share.js:241
 msgid "Expiration date"
-msgstr ""
+msgstr "Дата на изтичане"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
-msgstr ""
+msgstr "сподели по поща:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
-msgstr ""
+msgstr "Не са открити хора"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
-msgstr ""
+msgstr "група"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Допълнително споделяне не е разрешено"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Споделено в {item} с {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
-msgstr ""
+msgstr "Премахни споделяне"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
-msgstr ""
+msgstr "може да променя"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
-msgstr ""
+msgstr "контрол на достъпа"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "създаване"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
-msgstr ""
+msgstr "Обновяване"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
-msgstr ""
+msgstr "Изтриване"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
-msgstr ""
+msgstr "Споделяне"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
-msgstr ""
+msgstr "Защитено с парола"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Грешка при премахване на дата за изтичане"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Грепка при поставяне на дата за изтичане"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
-msgstr ""
+msgstr "Изпращам ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
-msgstr ""
+msgstr "Пощата е изпратена"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Внимание"
 
 #: js/tags.js:4
 msgid "The object type is not specified."
-msgstr ""
+msgstr "Видът на обекта не е избран"
 
 #: js/tags.js:13
 msgid "Enter new"
@@ -456,11 +467,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +497,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Ще получите връзка за нулиране на паролата Ви."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Потребител"
 
@@ -517,6 +534,18 @@ msgstr "Нова парола"
 msgid "Reset password"
 msgstr "Нулиране на парола"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Лични"
@@ -525,7 +554,7 @@ msgstr "Лични"
 msgid "Users"
 msgstr "Потребители"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Приложения"
 
@@ -635,49 +664,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Създаване на <strong>админ профил</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Разширено"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Директория за данни"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Конфигуриране на базата"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "ще се ползва"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Потребител за базата"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Парола за базата"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Име на базата"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Хост за базата"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Завършване на настройките"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +720,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Изход"
 
@@ -719,27 +746,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Забравена парола?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "запомни"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Вход"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index ef6b2a9422..6d6412edee 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Файлът е качен успешно"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Файлът който се опитвате да качите надвишава стойностите в MAX_FILE_SIZE в HTML формата."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файлът е качен частично"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Фахлът не бе качен"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Липсва временна папка"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Възникна проблем при запис в диска"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Невалидна директория."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Файлове"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Качването е спряно."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Споделяне"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Изтриване завинаги"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Преименуване"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Чакащо"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "възтановяване"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Променено"
 
@@ -301,12 +308,12 @@ msgstr "Променено"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Качване"
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr "Запис"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Ново"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Текстов файл"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Нова папка"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Папка"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Спри качването"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Няма нищо тук. Качете нещо."
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Изтриване"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Файлът който сте избрали за качване е прекалено голям"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Файловете се претърсват, изчакайте."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index e8c1b1e720..59c82a6961 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Записване..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index 8239f0abc7..4f7917a6fb 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Достъпът е даден"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Даване на достъп"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Потребители"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Изтриване"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Вкл. на поддръжка за външно потр. хранилище"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Позволено е на потребителите да ползват тяхно лично външно хранилище"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL основни сертификати"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Импортиране на основен сертификат"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index debc2b0a04..c1d33cccfd 100644
--- a/l10n/bg_BG/files_sharing.po
+++ b/l10n/bg_BG/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s сподели папката %s с Вас"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s сподели файла %s с Вас"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Изтегляне"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Качване"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Спри качването"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Няма наличен преглед за"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/bg_BG/files_trashbin.po b/l10n/bg_BG/files_trashbin.po
index a62aa28850..03d913bf79 100644
--- a/l10n/bg_BG/files_trashbin.po
+++ b/l10n/bg_BG/files_trashbin.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Невъзможно перманентното изтриване на %s"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Невъзможно възтановяване на %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Грешка"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Няма нищо. Кофата е празна!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Име"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Възтановяване"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Изтрито"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Изтриване"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Изтрити файлове"
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 1771455acb..602638fe77 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Помощ"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Лични"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Настройки"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Потребители"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Админ"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -62,15 +62,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "уеб услуги под Ваш контрол"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Изтеглянето като ZIP е изключено."
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Приложението не е включено."
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Възникна проблем с идентификацията"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Ключът е изтекъл, моля презаредете страницата"
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Файлове"
@@ -200,8 +199,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Необходимо е да влезете в всъществуващ акаунт или като администратора"
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Невалидно MySQL потребителско име и/или парола"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -228,21 +227,21 @@ msgstr "Проблемната команда беше: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL потребителят '%s'@'localhost' вече съществува"
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Изтриване на потребителя от MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL потребителят  '%s'@'%%' вече съществува."
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Изтриване на потребителя от MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -269,66 +268,72 @@ msgstr "Въведете потребителско име за админист
 msgid "Set an admin password."
 msgstr "Въведете парола за администратор."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Моля направете повторна справка с <a href='%s'>ръководството за инсталиране</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Невъзможно откриване на категорията \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "преди секунди"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "днес"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "вчера"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "последният месец"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "последната година"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "последните години"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 8cd636c911..1b3b08d1c8 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Пощата е изпратена"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Криптиране"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Потребителска документация"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Обновяване до {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Изключено"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Включено"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Моля почакайте...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Обновява се..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Грешка"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Обновяване"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Обновено"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Записване..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "възтановяване"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Изтриване"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "нова група"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Няма"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Вход"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Крон"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Споделяне"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Адрес на сървъра"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Още"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "По-малко"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,29 +603,33 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Добавете Ваше приложение"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Още приложения"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Изберете приложение"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Потребителска документация"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
@@ -506,7 +664,7 @@ msgstr "Покажи настройките за първоначално зар
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Парола"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr "Промяната на паролата не беше извършена"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Текуща парола"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Нова парола"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Промяна на паролата"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Вашия email адрес"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Въведете е-поща за възстановяване на паролата"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Отказ"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Език"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Помогнете с превода"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Криптиране"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Потребител"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Създаване"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Хранилище по подразбиране"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Неограничено"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Други"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Потребител"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Хранилище"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "По подразбиране"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 9a3ddf148f..78f3b6a114 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "Помощ"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/bn_BD/core.po b/l10n/bn_BD/core.po
index 7c1fcc50dd..de745e7cda 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "রবিবার"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "সোমবার"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "মঙ্গলবার"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "বুধবার"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "বৃহস্পতিবার"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "শুক্রবার"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "শনিবার"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "জানুয়ারি"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "ফেব্রুয়ারি"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "মার্চ"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "এপ্রিল"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "মে"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "জুন"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "জুলাই"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "অগাষ্ট"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "সেপ্টেম্বর"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "অক্টোবর"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "নভেম্বর"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "ডিসেম্বর"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "সংরক্ষণ করা হচ্ছে.."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "সেকেন্ড পূর্বে"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "আজ"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "গত মাস"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "মাস পূর্বে"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "গত বছর"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "বছর পূর্বে"
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "ভাগাভাগিকৃত"
@@ -276,12 +286,12 @@ msgstr "ভাগাভাগিকৃত"
 msgid "Share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  "
 
@@ -293,123 +303,123 @@ msgstr "ভাগাভাগি বাতিল করতে সমস্যা
 msgid "Error while changing permissions"
 msgstr "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner} আপনার সাথে ভাগাভাগি করেছেন"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "কূটশব্দ সুরক্ষিত"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "কূটশব্দ"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "ব্যক্তির সাথে ই-মেইল যুক্ত কর"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "পাঠাও"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "ই-মেইলের মাধ্যমে ভাগাভাগি করুনঃ"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "কোন ব্যক্তি খুঁজে পাওয়া গেল না"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "পূনঃরায় ভাগাভাগি অনুমোদিত নয়"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "ভাগাভাগি বাতিল "
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "সম্পাদনা করতে পারবেন"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "অধিগম্যতা নিয়ন্ত্রণ"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "তৈরী করুন"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "পরিবর্ধন কর"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "মুছে ফেল"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "ভাগাভাগি কর"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "কূটশব্দদ্বারা সুরক্ষিত"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "পাঠানো হচ্ছে......"
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "ই-মেইল পাঠানো হয়েছে"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "সতর্কবাণী"
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}"
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "ব্যবহারকারী"
 
@@ -517,6 +533,18 @@ msgstr "নতুন কূটশব্দ"
 msgid "Reset password"
 msgstr "কূটশব্দ পূনঃনির্ধারণ কর"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "ব্যক্তিগত"
@@ -525,7 +553,7 @@ msgstr "ব্যক্তিগত"
 msgid "Users"
 msgstr "ব্যবহারকারী"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "অ্যাপ"
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "সুচারু"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "ডাটা ফোল্ডার "
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "ডাটাবেচ কনফিগার করুন"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "ব্যবহৃত হবে"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "ডাটাবেজ ব্যবহারকারী"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "ডাটাবেজ কূটশব্দ"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "ডাটাবেজের নাম"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "ডাটাবেজ টেবলস্পেস"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "ডাটাবেজ হোস্ট"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "সেটআপ সুসম্পন্ন কর"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "প্রস্থান"
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "কূটশব্দ হারিয়েছেন?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "মনে রাখ"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "প্রবেশ"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 9d7ce1231d..43c3d26d9a 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "%s কে স্থানান্তর করা সম্ভব হলো না -  এই নামের ফাইল বিদ্যমান"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "%s  কে স্থানান্তর করা সম্ভব হলো না"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "ফাইলের নামটি ফাঁকা রাখা যাবে না।"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।"
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "কোন সমস্যা হয় নি, ফাইল আপলোড সুসম্পন্ন হয়েছে।"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "আপলোড করা  ফাইলটি php.ini তে বর্ণিত  upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "আপলোড করা ফাইলটি  HTML  ফর্মে উল্লিখিত MAX_FILE_SIZE নির্ধারিত ফাইলের সর্বোচ্চ আকার  অতিক্রম করতে চলেছে "
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "কোন ফাইল আপলোড করা হয় নি"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "অস্থায়ী ফোল্ডারটি হারানো গিয়েছে"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "ডিস্কে লিখতে ব্যর্থ"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "ভুল ডিরেক্টরি"
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "ফাইল"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "যথেষ্ঠ পরিমাণ স্থান নেই"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "আপলোড বাতিল করা হয়েছে।"
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।"
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} টি বিদ্যমান"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "ভাগাভাগি কর"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "পূনঃনামকরণ"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "মুলতুবি"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} কে {old_name} নামে প্রতিস্থাপন করা হয়েছে"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "ক্রিয়া প্রত্যাহার"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "টি একটি অননুমোদিত নাম।"
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।"
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "রাম"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "আকার"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "পরিবর্তিত"
 
@@ -301,12 +308,12 @@ msgstr "পরিবর্তিত"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "আপলোড"
 
@@ -342,72 +349,68 @@ msgstr "ZIP ফাইলের ইনপুটের সর্বোচ্চ 
 msgid "Save"
 msgstr "সংরক্ষণ"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "নতুন"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "টেক্সট ফাইল"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "ফোল্ডার"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr " লিংক থেকে"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "আপলোড বাতিল কর"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "এখানে কিছুই নেই। কিছু আপলোড করুন !"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "ডাউনলোড"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "মুছে"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "আপলোডের আকারটি অনেক বড়"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "আপনি এই সার্ভারে আপলোড করার জন্য অনুমোদিত ফাইলের সর্বোচ্চ আকারের চেয়ে বৃহদাকার ফাইল আপলোড করার চেষ্টা করছেন "
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "বর্তমান স্ক্যানিং"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index 948e9dfe6c..a05beb216f 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "সংরক্ষণ করা হচ্ছে.."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/bn_BD/files_external.po b/l10n/bn_BD/files_external.po
index 50383bb1fc..4c506cc354 100644
--- a/l10n/bn_BD/files_external.po
+++ b/l10n/bn_BD/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "অধিগমনের  অনুমতি প্রদান করা হলো"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা "
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "অধিগমনের  অনুমতি প্রদান কর"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "দয়া করে সঠিক এবং বৈধ Dropbox app key and secret প্রদান করুন।"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা "
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "ব্যবহারকারী"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "মুছে"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "ব্যবহারকারীর বাহ্যিক সংরক্ষণাগার সক্রিয় কর"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "ব্যবহারকারীদেরকে তাদের নিজস্ব বাহ্যিক সংরক্ষনাগার  সাউন্ট করতে অনুমোদন দাও"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL  রুট সনদপত্র"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "রুট সনদপত্রটি আমদানি করুন"
diff --git a/l10n/bn_BD/files_sharing.po b/l10n/bn_BD/files_sharing.po
index abb5382f98..67f9f305c7 100644
--- a/l10n/bn_BD/files_sharing.po
+++ b/l10n/bn_BD/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s আপনার সাথে %s ফোল্ডারটি ভাগাভাগি করেছেন"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s আপনার সাথে %s ফাইলটি ভাগাভাগি করেছেন"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "ডাউনলোড"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "আপলোড"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "আপলোড বাতিল কর"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "এর জন্য কোন প্রাকবীক্ষণ সুলভ নয়"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/bn_BD/files_trashbin.po b/l10n/bn_BD/files_trashbin.po
index ee47e996cb..33003d82e3 100644
--- a/l10n/bn_BD/files_trashbin.po
+++ b/l10n/bn_BD/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "সমস্যা"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "রাম"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "মুছে"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index aa82b97204..dc14b1ce4b 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "সহায়িকা"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "ব্যক্তিগত"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "নিয়ামকসমূহ"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "ব্যবহারকারী"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "প্রশাসন"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "ওয়েব সার্ভিস আপনার হাতের মুঠোয়"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP ডাউনলোড বন্ধ করা আছে।"
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "অ্যাপ্লিকেসনটি সক্রিয় নয়"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "অনুমোদন ঘটিত সমস্যা"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "টোকেন মেয়াদোত্তীর্ণ। দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।"
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "ফাইল"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "সেকেন্ড পূর্বে"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "আজ"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "গতকাল"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "গত মাস"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "গত বছর"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "বছর পূর্বে"
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 1145ec529f..6262dfa651 100644
--- a/l10n/bn_BD/settings.po
+++ b/l10n/bn_BD/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "ই-মেইল পাঠানো হয়েছে"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "সংকেতায়ন"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়"
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "ব্যবহারকারী সহায়িকা"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "নিষ্ক্রিয়"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "সক্রিয় "
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "পরিবর্ধন"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "সংরক্ষণ করা হচ্ছে.."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "ক্রিয়া প্রত্যাহার"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "গোষ্ঠীসমূহ"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "গোষ্ঠী প্রশাসক"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "মুছে"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "কোনটিই নয়"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "প্রবেশ"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "নিরাপত্তাজনিত সতর্কতা"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "সার্ভার ঠিকানা"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "পোর্ট"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "বেশী"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "কম"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "ভার্সন"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +603,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।"
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "আপনার অ্যাপটি যোগ করুন"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "আরও অ্যাপ"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "অ্যাপ নির্বাচন করুন"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com এ অ্যাপ্লিকেসন পৃষ্ঠা দেখুন"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-লাইসেন্সধারী <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "ব্যবহারকারী সহায়িকা"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "প্রশাসক সহায়িকা"
@@ -506,7 +664,7 @@ msgstr "প্রথমবার চালানোর যাদুকর পূ
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "কূটশব্দ"
 
@@ -518,151 +676,149 @@ msgstr "আপনার কূটশব্দটি পরিবর্তন ক
 msgid "Unable to change your password"
 msgstr "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "বর্তমান কূটশব্দ"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "নতুন কূটশব্দ"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "কূটশব্দ পরিবর্তন করুন"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "ইমেইল"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "আপনার ই-মেইল ঠিকানা"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "বাতির"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "ভাষা"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "অনুবাদ করতে সহায়তা করুন"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "সংকেতায়ন"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "প্রবেশ"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "তৈরী কর"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "পূর্বনির্ধারিত সংরক্ষণাগার"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "অসীম"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "ব্যবহারকারী"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "সংরক্ষণাগার"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "পূর্বনির্ধারিত"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 600c503421..a7caeb4019 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "সমস্যা"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "সহায়িকা"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr "সুচারু ট্যঅবে গিয়ে আপনি ব্
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr "গোষ্ঠী-সদস্য সংস্থাপন"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "বাইটে"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/bs/core.po b/l10n/bs/core.po
index 08753f3c8f..fe90076c0d 100644
--- a/l10n/bs/core.po
+++ b/l10n/bs/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,139 +58,143 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Spašavam..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -273,6 +263,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -281,12 +291,12 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -298,123 +308,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -461,11 +471,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -485,8 +501,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -522,6 +538,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -530,7 +558,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -640,49 +668,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -698,7 +724,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -724,27 +750,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/bs/files.po b/l10n/bs/files.po
index 440f16a2ce..09ae4d496d 100644
--- a/l10n/bs/files.po
+++ b/l10n/bs/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,286 +17,293 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -304,12 +311,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -345,72 +352,68 @@ msgstr ""
 msgid "Save"
 msgstr "Spasi"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nova fascikla"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Fasikla"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/bs/files_encryption.po b/l10n/bs/files_encryption.po
index acc68558cf..818ff9d361 100644
--- a/l10n/bs/files_encryption.po
+++ b/l10n/bs/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Spašavam..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/bs/files_external.po b/l10n/bs/files_external.po
index 631ae608ba..5207d2bbb5 100644
--- a/l10n/bs/files_external.po
+++ b/l10n/bs/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-06-13 02:16+0200\n"
-"PO-Revision-Date: 2013-06-12 21:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/bs/files_sharing.po b/l10n/bs/files_sharing.po
index 386d74cf54..b43e3b6b0b 100644
--- a/l10n/bs/files_sharing.po
+++ b/l10n/bs/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/bs/files_trashbin.po b/l10n/bs/files_trashbin.po
index e2a429d710..7f286786a0 100644
--- a/l10n/bs/files_trashbin.po
+++ b/l10n/bs/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr "Ime"
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/bs/lib.po b/l10n/bs/lib.po
index 447589d9b0..ddf2e1f969 100644
--- a/l10n/bs/lib.po
+++ b/l10n/bs/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,70 +267,76 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/bs/settings.po b/l10n/bs/settings.po
index fd98969886..42c0053daf 100644
--- a/l10n/bs/settings.po
+++ b/l10n/bs/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Spašavam..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/bs/user_ldap.po b/l10n/bs/user_ldap.po
index fb4bd54b94..268fdc806b 100644
--- a/l10n/bs/user_ldap.po
+++ b/l10n/bs/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -200,7 +200,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -268,7 +268,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -411,41 +411,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 2a27131c22..6ea1ff1cdb 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -5,12 +5,13 @@
 # Translators:
 # rogerc, 2013-2014
 # rogerc, 2013
+# aseques <sacoo2@hotmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-05 01:55-0500\n"
-"PO-Revision-Date: 2014-01-04 10:20+0000\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-25 13:08+0000\n"
 "Last-Translator: rogerc\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +20,11 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s ha compartit »%s« amb tu"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "La data de venciment és en el passat."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "No s'ha pogut enviar correu als usuaris següents: %s"
@@ -41,19 +41,6 @@ msgstr "Desactivat el mode de manteniment"
 msgid "Updated database"
 msgstr "Actualitzada la base de dades"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Actualitzant la memòria de cau del fitxers, això pot trigar molt..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Actualitzada la memòria de cau dels fitxers"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% fet ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No s'han proporcionat imatges o fitxers"
@@ -74,135 +61,139 @@ msgstr "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho"
 msgid "No crop data provided"
 msgstr "No heu proporcionat dades del retall"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Dilluns"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Dijous"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Divendres"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Gener"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Febrer"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Març"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maig"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juny"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juliol"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Agost"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Setembre"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Desembre"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Configuració"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Desant..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "fa %n minut"
 msgstr[1] "fa %n minuts"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "fa %n hora"
 msgstr[1] "fa %n hores"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "fa %n dies"
 msgstr[1] "fa %n dies"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "fa %n mes"
 msgstr[1] "fa %n mesos"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "anys enrere"
 
@@ -270,6 +261,26 @@ msgstr "({count} seleccionats)"
 msgid "Error loading file exists template"
 msgstr "Error en carregar la plantilla de fitxer existent"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Contrasenya massa feble"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Contrasenya feble"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Contrasenya passable"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Contrasenya bona"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Contrasenya forta"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Compartit"
@@ -278,12 +289,12 @@ msgstr "Compartit"
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error en compartir"
 
@@ -295,123 +306,123 @@ msgstr "Error en deixar de compartir"
 msgid "Error while changing permissions"
 msgstr "Error en canviar els permisos"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartit amb vos i amb el grup {group} per {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Compartit amb vos per {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Comparteix amb usuari o grup..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Enllaç de compartició"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Contrasenya"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Permet pujada pública"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Enllaç per correu electrónic amb la persona"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Envia"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Estableix la data de venciment"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Data de venciment"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Comparteix per correu electrònic"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "No s'ha trobat ningú"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "No es permet compartir de nou"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Compartit en {item} amb {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "notifica per correu electrònic"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "pot editar"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "control d'accés"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "actualitza"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "comparteix"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protegeix amb contrasenya"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data de venciment"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error en establir la data de venciment"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Enviant..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "El correu electrónic s'ha enviat"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Avís"
 
@@ -458,11 +469,17 @@ msgstr "L'actualització ha estat incorrecte. Comuniqueu aquest error a <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'actualització ha estat correcte. Ara us redirigim a ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "restableix la contrasenya %s"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Hi ha hagut un problema enviant el correu, parleu amb el vostre administrador."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Useu l'enllaç següent per restablir la contrasenya: {link}"
@@ -482,8 +499,8 @@ msgstr "La petició ha fallat!<br>Esteu segur que el correu/nom d'usuari és cor
 msgid "You will receive a link to reset your password via Email."
 msgstr "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nom d'usuari"
 
@@ -519,6 +536,18 @@ msgstr "Contrasenya nova"
 msgid "Reset password"
 msgstr "Reinicialitza la contrasenya"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -527,7 +556,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usuaris"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplicacions"
 
@@ -637,49 +666,47 @@ msgstr "Per informació de com configurar el servidor, comproveu la <a href=\"%s
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte d'administrador</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avançat"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Emmagatzematge i base de dades"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Carpeta de dades"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configura la base de dades"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "s'usarà"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuari de la base de dades"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Contrasenya de la base de dades"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Espai de taula de la base de dades"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Acabant..."
 
@@ -695,19 +722,19 @@ msgstr "Aquesta aplicació necessita tenir JavaScript activat per funcionar corr
 msgid "%s is available. Get more information on how to update."
 msgstr "%s està disponible. Obtingueu més informació de com actualitzar."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Surt"
 
 #: templates/login.php:9
 msgid "Automatic logon rejected!"
-msgstr "L'ha rebutjat l'acceditació automàtica!"
+msgstr "Inici de sessió automàtic rebutjat!"
 
 #: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!"
+msgstr "Si no heu canviat la contrasenya recentment el vostre compte pot estar compromès!"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
@@ -721,28 +748,28 @@ msgstr "L'autenticació del servidor ha fallat!"
 msgid "Please contact your administrator."
 msgstr "Contacteu amb l'administrador."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Heu perdut la contrasenya?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "recorda'm"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Inici de sessió"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Acreditacions alternatives"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Ei,<br><br>només fer-te saber que %s ha compartit »%s« amb tu.<br><a href=\"%s\">Mira-ho!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Ei, <br><br>només fer-vos saber que %s us ha comparti <strong>%s</strong>. <br><a href=\"%s\">Mireu-ho!</a>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index e96c34be04..f504332b2d 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# rogerc, 2013
+# 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: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\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"
@@ -20,283 +21,290 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr " No s'ha pogut moure %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "El nom del fitxer no pot ser buit."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "El nom de fitxer no pot contenir \"/\". Indiqueu un nom diferent."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" no es un fitxer vàlid."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "La carpeta de destí s'ha mogut o eliminat."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "El nom %s ja s'usa en la carpeta %s. Indiqueu un nom diferent."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "No és un origen vàlid"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
+msgstr "El servidor no té autorització per obrir URLs, comproveu la configuració del servidor"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "S'ha produït un error en baixar %s a %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "S'ha produït un error en crear el fitxer"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "El nom de la carpeta no pot ser buit."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "El nom de la carpeta no pot contenir \"/\". Indiqueu un nom diferent."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "S'ha produït un error en crear la carpeta"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "No es pot establir la carpeta de pujada."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Testimoni no vàlid"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "No hi ha errors, el fitxer s'ha carregat correctament"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer només s'ha carregat parcialment"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "No s'ha carregat cap fitxer"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Falta un fitxer temporal"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Ha fallat en escriure al disc"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "No hi ha prou espai disponible"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "La pujada ha fallat. El fitxer pujat no s'ha trobat."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Directori no vàlid."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Fitxers"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "No es pot pujar {filename} perquè és una carpeta o té 0 bytes"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "No hi ha prou espai disponible"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Mida total del fitxer {size1} excedeix el límit de pujada {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "No hi ha resposta del servidor."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "L'URL no pot ser buit"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "A la carpeta inici 'Compartit' és un nom de fitxer reservat"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "No s'ha pogut crear el fitxer"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "No s'ha pogut crear la carpeta"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
-msgstr ""
+msgstr "Error en obtenir la URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Comparteix"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Esborra permanentment"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Pendent"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "No es pot canviar el nom de fitxer"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "s'ha substituït {old_name} per {new_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Error en esborrar el fitxer."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetes"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fitxer"
 msgstr[1] "%n fitxers"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} i {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Pujant %n fitxer"
 msgstr[1] "Pujant %n fitxers"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' és un nom no vàlid per un fitxer."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" no es un fitxer vàlid."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "L'aplicació d'encriptació està activada però les claus no estan inicialitzades, sortiu i acrediteu-vos de nou."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "La clau privada de l'aplicació d'encriptació no és vàlida! Actualitzeu la contrasenya de la clau privada a l'arranjament personal per recuperar els fitxers encriptats."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "S'està preparant la baixada. Pot trigar una estona si els fitxers són grans."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Error en moure el fitxer"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
@@ -304,12 +312,12 @@ msgstr "Modificat"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nom de carpeta no vàlid. L'ús de 'Shared' és reservat"
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s no es pot canviar el nom"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Puja"
 
@@ -345,72 +353,68 @@ msgstr "Mida màxima d'entrada per fitxers ZIP"
 msgid "Save"
 msgstr "Desa"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nou"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Nou fitxer de text"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Fitxer de text"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Carpeta nova"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Des d'enllaç"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Fitxers esborrats"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancel·la la pujada"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "No teniu permisos per a pujar o crear els fitxers aquí"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquí. Pugeu alguna cosa!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Esborra"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Actualment escanejant"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Actualitzant la memòria de cau del sistema de fitxers..."
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 95c9dcd2ca..3865dfb313 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -3,15 +3,15 @@
 # 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: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-12-02 11:30+0000\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"
@@ -83,18 +83,18 @@ msgid ""
 "administrator"
 msgstr "Error desconegut. Comproveu l'arranjament del sistema o contacteu amb l'administrador"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Manca de requisits."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Els usuaris següents no estan configurats per a l'encriptació:"
 
@@ -102,9 +102,9 @@ msgstr "Els usuaris següents no estan configurats per a l'encriptació:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "La encriptació inicial ha començat... Pot trigar una estona, espereu."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Desant..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+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 e8defe258b..711c32d326 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -3,13 +3,14 @@
 # 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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\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"
@@ -18,40 +19,44 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "S'ha concedit l'accés"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Error en configurar l'emmagatzemament Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Concedeix accés"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Error en configurar l'emmagatzemament Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Desat"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Avís:</b> \"smbclient\" no està instal·lat. No es pot muntar la compartició CIFS/SMB. Demaneu a l'administrador del sistema que l'instal·li."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Avís:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar la compartició FTP. Demaneu a l'administrador del sistema que l'instal·li."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +108,22 @@ msgid "Users"
 msgstr "Usuaris"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Esborra"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Habilita l'emmagatzemament extern d'usuari"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Permet als usuaris muntar el seu emmagatzemament extern propi"
+msgid "Allow users to mount the following external storage"
+msgstr "Permet als usuaris muntar els dispositius externs següents"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Certificats SSL root"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importa certificat root"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index bf549bf980..9452db004b 100644
--- a/l10n/ca/files_sharing.po
+++ b/l10n/ca/files_sharing.po
@@ -3,13 +3,13 @@
 # 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: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\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"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Compartits per {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Aquest compartit està protegit amb contrasenya"
@@ -54,32 +58,16 @@ msgstr "s'ha desactivat la compartició"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Per més informació contacteu amb qui us ha enviat l'enllaç."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s ha compartit la carpeta %s amb vós"
+msgid "shared by %s"
+msgstr "compartit per %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s ha compartit el fitxer %s amb vós"
+msgid "Download %s"
+msgstr "Baixa %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Baixa"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Puja"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Cancel·la la pujada"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "No hi ha vista prèvia disponible per a"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Enllaç directe"
diff --git a/l10n/ca/files_trashbin.po b/l10n/ca/files_trashbin.po
index dec2858e3b..75c3e9fb4a 100644
--- a/l10n/ca/files_trashbin.po
+++ b/l10n/ca/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "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"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "No s'ha pogut esborrar permanentment %s"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "No s'ha pogut restaurar %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Fitxers esborrats"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Error"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "restaurat"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "La paperera està buida!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nom"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Recupera"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Eliminat"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Esborra"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Fitxers eliminats"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 2cfd9ff67e..be84319073 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: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "L'aplicació \"%s\" no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "No heu especificat cap nom d'aplicació"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Ajuda"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Configuració"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Usuaris"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administració"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Ha fallat l'actualització \"%s\"."
@@ -62,15 +62,10 @@ msgstr "Tipus de fitxer desconegut"
 msgid "Invalid image"
 msgstr "Imatge no vàlida"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "no es pot obrir \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "La baixada en ZIP està desactivada."
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr "Baixeu els fitxers separadament en petits trossos o pregunteu a l'administrador."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "No heu especificat la font en instal·lar l'aplicació"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "No heu especificat href en instal·lar l'aplicació des de http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "No heu seleccionat el camí en instal·lar una aplicació des d'un fitxer local"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Els fitxers del tipus %s no són compatibles"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Ha fallat l'obertura del fitxer en instal·lar l'aplicació"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "L'aplicació no proporciona un fitxer info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "L'aplicació no es pot instal·lar perquè hi ha codi no autoritzat en l'aplicació"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "L'aplicació no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "L'aplicació no es pot instal·lar perquè conté l'etiqueta <shipped>vertader</shipped> que no es permet per aplicacions no enviades"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "L'aplicació no es pot instal·lar perquè la versió a info.xml/version no és la mateixa que la versió indicada des de la botiga d'aplicacions"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "La carpeta de l'aplicació ja existeix"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "No es pot crear la carpeta de l'aplicació. Arregleu els permisos. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "L'aplicació no està habilitada"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Error d'autenticació"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "El testimoni ha expirat. Torneu a carregar la pàgina."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Usuari desconegut"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Fitxers"
@@ -194,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 username and/or password not valid"
-msgstr "Nom d'usuari i/o contrasenya MySQL no vàlids"
+msgid "MySQL/MariaDB username and/or password not valid"
+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\""
@@ -219,30 +218,30 @@ 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\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "L'usuari MySQL '%s'@'localhost' ja existeix."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "L'usuari MySQL/MariaDB '%s'@'localhost' ja existeix."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Elimina aquest usuari de MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Esborreu aquest usuari de MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "L'usuari MySQL '%s'@'%%' ja existeix"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "L'usuari MySQL/MariaDB '%s'@'%%' ja existeix"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Elimina aquest usuari de MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Esborreu aquest usuari de MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -257,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"
 
@@ -269,66 +268,72 @@ msgstr "Establiu un nom d'usuari per l'administrador."
 msgid "Set an admin password."
 msgstr "Establiu una contrasenya per l'administrador."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s ha compartit »%s« amb tu"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "No s'ha trobat la categoria \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "fa %n minut"
 msgstr[1] "fa %n minuts"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "fa %n hora"
 msgstr[1] "fa %n hores"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "avui"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ahir"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "fa %n dia"
 msgstr[1] "fa %n dies"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "el mes passat"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "fa %n mes"
 msgstr[1] "fa %n mesos"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "l'any passat"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "anys enrere"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index b2b009170a..9368907aeb 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# rogerc, 2013
+# rogerc, 2013-2014
+# Josep Torné <josep@substantiu.com>, 2014
 # rogerc, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 13:43+0000\n"
+"Last-Translator: Josep Torné <josep@substantiu.com>\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"
@@ -19,6 +20,48 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "El valor proporcionat no és vàlid per %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Desat"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "prova l'arranjament del correu"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+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 "Hi ha hagut un problema en enviar el correu. Comproveu-ne l'arranjament."
+
+#: admin/controller.php:99
+msgid "Email sent"
+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 "Heu d'establir un nom d'usuari abans de poder enviar correus de prova."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Mode d'enviament"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Xifrat"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Mètode d'autenticació"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "No s'ha pogut carregar la llista des de l'App Store"
@@ -115,62 +158,90 @@ msgstr "El dorsal no permet canviar la contrasenya, però la clau d'encripació
 msgid "Unable to change password"
 msgstr "No es pot canviar la contrasenya"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Enviant..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Documentació d'usuari"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Documentació d'administrador"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Actualitza a {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Desactiva"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Habilita"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Espereu..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Error en desactivar l'aplicació"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Error en activar l'aplicació"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Actualitzant..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Error en actualitzar l'aplicació"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Actualitza"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Actualitzada"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Seleccioneu una imatge de perfil"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Contrasenya massa feble"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Contrasenya feble"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Contrasenya passable"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Contrasenya bona"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Contrasenya forta"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Desencriptant fitxers... Espereu, això pot trigar una estona."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Desant..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "esborrat"
@@ -183,40 +254,40 @@ msgstr "desfés"
 msgid "Unable to remove user"
 msgstr "No s'ha pogut eliminar l'usuari"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grups"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grup Admin"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Esborra"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "afegeix grup"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Heu de facilitar un nom d'usuari vàlid"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Error en crear l'usuari"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Heu de facilitar una contrasenya vàlida"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Català"
 
@@ -240,18 +311,42 @@ msgstr "Errors i problemes fatals"
 msgid "Fatal issues only"
 msgstr "Només problemes fatals"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Cap"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Inici de sessió"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Pla"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "Gestor NT LAN"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Avís de seguretat"
 
-#: templates/admin.php:25
+#: 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 "Esteu accedint %s a través de HTTP. Us recomanem fermament que configureu el servidor perquè requereixi HTTPS."
 
-#: templates/admin.php:39
+#: 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 "
@@ -260,68 +355,68 @@ msgid ""
 "root."
 msgstr "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La fitxer .htaccess no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Avís de configuració"
 
-#: templates/admin.php:53
+#: 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 "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Comproveu les <a href='%s'>guies d'instal·lació</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "No s'ha trobat el mòdul 'fileinfo'"
 
-#: templates/admin.php:68
+#: 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 "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
-msgstr ""
+msgstr "La versió de PHP és obsoleta"
 
-#: templates/admin.php:82
+#: 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 ""
+msgstr "La versió de PHP és obsoleta. Us recomanem fermament que actualitzeu a la versió 5.3.8 o superior perquè les versions anteriors no funcionen. La instal·lació podria no funcionar correctament."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Locale no funciona"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "No s'ha pogut establir cap localització del sistema amb suport per UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer."
 
-#: templates/admin.php:106
+#: 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 "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s"
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "La connexió a internet no funciona"
 
-#: templates/admin.php:121
+#: 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 "
@@ -330,118 +425,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Aquest servidor no té cap connexió a internet que funcioni. Això significa que algunes de les característiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les característiques."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "L'últim cron s'ha executat el %s"
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Executa una tasca per cada paquet carregat"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Utilitza el servei cron del sistema per fer una crida al fitxer cron.php cada 15 minuts."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartir"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Habilita l'API de compartir"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Permet que les aplicacions utilitzin l'API de compartir"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permet enllaços"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 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:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permet pujada pública"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 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:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permet compartir de nou"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 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:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permet compartir amb qualsevol"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 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:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permet notificacions per correu electrónic"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 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:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Seguretat"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Força HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, 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:242
+#: templates/admin.php:282
 #, 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:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Servidor de correu"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "S'usa per enviar notificacions."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Des de l'adreça"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Es requereix autenticació"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Adreça del servidor"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Credencials"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "Nom d'usuari SMTP"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "Contrasenya SMTP"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Prova l'arranjament del correu"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Envia correu"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivell de registre"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Més"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menys"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versió"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -451,30 +606,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Afegiu la vostra aplicació"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Més aplicacions"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Seleccioneu una aplicació"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Documentació:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Mireu la pàgina d'aplicacions a apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Mostra la web de l'aplicació"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Documentació d'usuari"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentació d'administrador"
@@ -508,7 +667,7 @@ msgstr "Torna a mostrar l'assistent de primera execució"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -520,151 +679,149 @@ msgstr "La seva contrasenya s'ha canviat"
 msgid "Unable to change your password"
 msgstr "No s'ha pogut canviar la contrasenya"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contrasenya actual"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Contrasenya nova"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Canvia la contrasenya"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Correu electrònic"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Ompliu el correu electrònic per activar la recuperació de contrasenya"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Ompliu una adreça de correu per poder recuperar la contrasenya i rebre notificacions"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Foto de perfil"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Puja'n una de nova"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Selecciona'n una de nova dels fitxers"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Elimina imatge"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "El vostre compte original proporciona l'avatar."
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Cancel·la"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Selecciona com a imatge de perfil"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Ajudeu-nos amb la traducció"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Xifrat"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Contrasenya d'accés"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Desencripta tots els fitxers"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Nom d'accés"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Recuperació de contrasenya d'administrador"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Emmagatzemament per defecte"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Il·limitat"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Un altre"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nom d'usuari"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Emmagatzemament"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "canvia el nom complet"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "estableix nova contrasenya"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Per defecte"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index bf9ea4772c..90f2c187f2 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: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+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"
@@ -89,43 +89,43 @@ msgstr "Èxit"
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Configuració correcte"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Configuració incorrecte"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Configuració incompleta"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Selecciona els grups"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Seleccioneu les classes dels objectes"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Seleccioneu els atributs"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "La prova de connexió ha reeixit"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "La prova de connexió ha fallat"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Voleu eliminar la configuració actual del servidor?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Confirma l'eliminació"
 
@@ -143,11 +143,11 @@ msgid_plural "%s users found"
 msgstr[0] "S'ha trobat %s usuari"
 msgstr[1] "S'han trobat %s usuaris"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Ordinador central no vàlid"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "La característica desitjada no s'ha trobat"
 
@@ -165,8 +165,8 @@ msgstr "Ajuda"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Limita l'accés a %s grups que compleixin amb el criteri:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Els grups que compleixen aquests criteris estan disponibles a %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -201,8 +201,8 @@ msgid "groups found"
 msgstr "grups trobats"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Quin atribut s'hauria d'utilitzar com a nom per a l'acreditació:"
+msgid "Users login with this attribute:"
+msgstr "Usuaris acreditats amb aquest atribut:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -269,8 +269,8 @@ msgstr "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat"
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Limita l'accés a %s usuaris que compleixin amb el criteri:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Limita l'accés a %s usuaris que compleixin amb aquest criteri:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -412,41 +412,51 @@ msgstr "Atributs de cerca de grup"
 msgid "Group-Member association"
 msgstr "Associació membres-grup"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+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 "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"
 msgstr "Atributs especials"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Camp de quota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Quota per defecte"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Camp de correu electrònic"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Norma per anomenar la carpeta arrel d'usuari"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Nom d'usuari intern"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -462,15 +472,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Per defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home d'usuari. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits)."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atribut nom d'usuari intern:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Sobrescriu la detecció UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -481,19 +491,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Per defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits)."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Atribut UUID per Usuaris:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Atribut UUID per Grups:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Mapatge d'usuari Nom d'usuari-LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -507,10 +517,10 @@ msgid ""
 "experimental stage."
 msgstr "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria de cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Elimina el mapatge d'usuari Nom d'usuari-LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Elimina el mapatge de grup Nom de grup-LDAP"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index a77422d481..32fec75418 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
-# pstast <petr@stastny.eu>, 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: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: liska_\n"
+"POT-Creation-Date: 2014-03-24 01:55-0400\n"
+"PO-Revision-Date: 2014-03-23 22:41+0000\n"
+"Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +25,11 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s s vámi sdílí »%s«"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "Datum expirace je v minulosti."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nebylo možné odeslat e-mail následujícím uživatelům: %s"
@@ -46,19 +46,6 @@ msgstr "Vypnut režim údržby"
 msgid "Updated database"
 msgstr "Zaktualizována databáze"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Aktualizuji souborovou mezipaměť, toto může trvat opravdu dlouho..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Aktualizována souborová mezipaměť"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% dokončeno ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Soubor nebo obrázek nebyl zadán"
@@ -79,139 +66,143 @@ msgstr "Dočasný profilový obrázek není k dispozici, zkuste to znovu"
 msgid "No crop data provided"
 msgstr "Nebyla poskytnuta data pro oříznutí obrázku"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Neděle"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Pondělí"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Středa"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Pátek"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Leden"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Únor"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Březen"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Duben"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Květen"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Červen"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Červenec"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Srpen"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Září"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Říjen"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Listopad"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Prosinec"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Ukládám..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "před pár vteřinami"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "před %n minutou"
 msgstr[1] "před %n minutami"
 msgstr[2] "před %n minutami"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "před %n hodinou"
 msgstr[1] "před %n hodinami"
 msgstr[2] "před %n hodinami"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "před %n dnem"
 msgstr[1] "před %n dny"
 msgstr[2] "před %n dny"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "minulý měsíc"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "před %n měsícem"
 msgstr[1] "před %n měsíci"
 msgstr[2] "před %n měsíci"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "před měsíci"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "před lety"
 
@@ -280,6 +271,26 @@ msgstr "(vybráno {count})"
 msgid "Error loading file exists template"
 msgstr "Chyba při nahrávání šablony existence souboru"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Velmi slabé heslo"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Slabé heslo"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Středně silné heslo"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Dobré heslo"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Silné heslo"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Sdílené"
@@ -288,12 +299,12 @@ msgstr "Sdílené"
 msgid "Share"
 msgstr "Sdílet"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Chyba"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Chyba při sdílení"
 
@@ -305,123 +316,123 @@ msgstr "Chyba při rušení sdílení"
 msgid "Error while changing permissions"
 msgstr "Chyba při změně oprávnění"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "S Vámi a skupinou {group} sdílí {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "S Vámi sdílí {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Sdílet s uživatelem nebo skupinou"
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Sdílet odkaz"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Chránit heslem"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Heslo"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Povolit veřejné nahrávání"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Odeslat osobě odkaz e-mailem"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Odeslat"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Nastavit datum vypršení platnosti"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Datum vypršení platnosti"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Sdílet e-mailem:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Žádní lidé nenalezeni"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Sdílení již sdílené položky není povoleno"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Sdíleno v {item} s {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Zrušit sdílení"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "upozornit e-mailem"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "lze upravovat"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "řízení přístupu"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "vytvořit"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "aktualizovat"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "smazat"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "sdílet"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Chráněno heslem"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Chyba při odstraňování data vypršení platnosti"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Chyba při nastavení data vypršení platnosti"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Odesílám ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail odeslán"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Varování"
 
@@ -468,11 +479,17 @@ msgstr "Aktualizace neproběhla úspěšně. Nahlaste prosím problém do <a hre
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizace byla úspěšná. Přesměrovávám na ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "reset hesla %s"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Při odesílání e-mailu nastala chyba, kontaktujte prosím svého administrátora."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Heslo obnovíte použitím následujícího odkazu: {link}"
@@ -492,8 +509,8 @@ msgstr "Požadavek selhal!<br>Ujistili jste se, že vaše uživatelské jméno a
 msgid "You will receive a link to reset your password via Email."
 msgstr "E-mailem Vám bude zaslán odkaz pro obnovu hesla."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Uživatelské jméno"
 
@@ -529,6 +546,18 @@ msgstr "Nové heslo"
 msgid "Reset password"
 msgstr "Obnovit heslo"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Osobní"
@@ -537,7 +566,7 @@ msgstr "Osobní"
 msgid "Users"
 msgstr "Uživatelé"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplikace"
 
@@ -647,49 +676,47 @@ msgstr "Pro informace, jak správně nastavit váš server, se podívejte do <a
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvořit <strong>účet správce</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Pokročilé"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Úložiště & databáze"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Složka s daty"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Nastavit databázi"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "bude použito"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Uživatel databáze"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Heslo databáze"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Název databáze"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tabulkový prostor databáze"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Hostitel databáze"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Dokončit nastavení"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Dokončuji..."
 
@@ -698,14 +725,14 @@ msgid ""
 "This application requires JavaScript to be enabled for correct operation.  "
 "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
 "JavaScript</a> and re-load this interface."
-msgstr "Tato aplikace potřebuje pro svou správnou funkčnost mít povolený javascript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte toto rozhraní."
+msgstr "Tato aplikace vyžaduje pro svou správnou funkčnost povolený JavaScript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte toto rozhraní."
 
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je dostupná. Získejte více informací k postupu aktualizace."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Odhlásit se"
 
@@ -731,28 +758,28 @@ msgstr "Autentizace na serveru selhala!"
 msgid "Please contact your administrator."
 msgstr "Kontaktujte prosím vašeho správce."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Ztratili jste své heslo?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "zapamatovat"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Přihlásit"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternativní přihlášení"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hej ty tam,<br><br>jen ti chci dát vědět, že %s sdílel »%s« s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Hej ty,<br><br>jen ti dávám vědět, že %s sdílí <strong>%s</strong> s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 40608268d8..cdc38895bf 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-01-04 01:55-0500\n"
-"PO-Revision-Date: 2014-01-02 07:30+0000\n"
-"Last-Translator: liska_\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,286 +25,293 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Nelze přesunout %s - již existuje soubor se stejným názvem"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Nelze přesunout %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Název souboru nemůže být prázdný řetězec."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Název souboru nesmí obsahovat \"/\". Vyberte prosím jiné jméno."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" je neplatným názvem souboru."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "Cílová složka byla přesunuta nebo smazána."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Název %s ve složce %s již existuje. Vyberte prosím jiné jméno."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Neplatný zdroj"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Server není oprávněn otevírat adresy URL. Ověřte, prosím, konfiguraci serveru."
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Chyba při stahování %s do %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Chyba při vytváření souboru"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Název složky nemůže být prázdný."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Název složky nesmí obsahovat \"/\". Zvolte prosím jiný."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Chyba při vytváření složky"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Nelze nastavit adresář pro nahrané soubory."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Neplatný token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Žádný soubor nebyl odeslán. Neznámá chyba"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Soubor byl odeslán úspěšně"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný ve formuláři HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Soubor byl odeslán pouze částečně"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Žádný soubor nebyl odeslán"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Chybí adresář pro dočasné soubory"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Zápis na disk selhal"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Nedostatek dostupného úložného prostoru"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Nahrávání selhalo. Nepodařilo se získat informace o souboru."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Nahrávání selhalo. Nepodařilo se nalézt nahraný soubor."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Nahrávání selhalo. Nepodařilo se získat informace o souboru."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Neplatný adresář"
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Soubory"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Nedostatek volného místa"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Odesílání zrušeno."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Nepodařilo se získat výsledek ze serveru."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL nemůže zůstat prázdná"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "V osobní složce je název 'Shared' rezervovaný"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} již existuje"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Nepodařilo se vytvořit soubor"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Nepodařilo se vytvořit složku"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Chyba při načítání URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Sdílet"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Trvale odstranit"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Nevyřízené"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Nepodařilo se přejmenovat soubor"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "nahrazeno {new_name} s {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "vrátit zpět"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Chyba při mazání souboru."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n složka"
 msgstr[1] "%n složky"
 msgstr[2] "%n složek"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n soubor"
 msgstr[1] "%n soubory"
 msgstr[2] "%n souborů"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} a {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Nahrávám %n soubor"
 msgstr[1] "Nahrávám %n soubory"
 msgstr[2] "Nahrávám %n souborů"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' je neplatným názvem souboru."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" je neplatným názvem souboru."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory."
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Vaše úložiště je téměř plné ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Aplikace pro šifrování je zapnuta, ale vaše klíče nejsou inicializované. Prosím odhlaste se a znovu přihlaste"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Chybný soukromý klíč pro šifrovací aplikaci. Aktualizujte prosím heslo svého soukromého klíče ve vašem osobním nastavení, abyste znovu získali přístup k vašim zašifrovaným souborům."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Vaše soubory ke stažení se připravují. Pokud jsou velké, může to chvíli trvat."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Chyba při přesunu souboru"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Chyba"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Název"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Upraveno"
 
@@ -311,12 +319,12 @@ msgstr "Upraveno"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Neplatný název složky. Použití 'Shared' je rezervováno."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nemůže být přejmenován"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Odeslat"
 
@@ -352,72 +360,68 @@ msgstr "Maximální velikost vstupu pro ZIP soubory"
 msgid "Save"
 msgstr "Uložit"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nový"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Nový textový soubor"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Textový soubor"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nová složka"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Složka"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Odstraněné soubory"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Zrušit odesílání"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Nemáte oprávnění zde nahrávat či vytvářet soubory"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Žádný obsah. Nahrajte něco."
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Smazat"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Odesílaný soubor je příliš velký"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledávají, prosím čekejte."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Aktualizuji mezipaměť souborového systému..."
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index c3342c6721..27f50770da 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -7,14 +7,14 @@
 # Honza K. <honza889@gmail.com>, 2013
 # liska_, 2013
 # Martin <fireball@atlas.cz>, 2013
-# pstast <petr@stastny.eu>, 2013
+# 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: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-12-02 20:00+0000\n"
+"POT-Creation-Date: 2014-03-24 01:55-0400\n"
+"PO-Revision-Date: 2014-03-23 22:41+0000\n"
 "Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -86,18 +86,18 @@ msgid ""
 "administrator"
 msgstr "Neznámá chyba, zkontrolujte vaše systémová nastavení nebo kontaktujte vašeho správce"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Nesplněné závislosti."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Následující uživatelé nemají nastavené šifrování:"
 
@@ -105,9 +105,9 @@ msgstr "Následující uživatelé nemají nastavené šifrování:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počkejte prosím."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Ukládám..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Probíhá počáteční šifrování... Zkuste to prosím znovu později."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 9c03428285..b9152a082a 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# pstast <petr@stastny.eu>, 2013
+# m23 <black23@gmail.com>, 2014
+# pstast <petr@stastny.eu>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
+"POT-Creation-Date: 2014-03-24 01:55-0400\n"
+"PO-Revision-Date: 2014-03-23 21:50+0000\n"
 "Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -18,40 +19,44 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Přístup povolen"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Chyba při nastavení úložiště Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Povolit přístup"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba při nastavení úložiště Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Uloženo"
+
+#: lib/config.php:631
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Varování:</b> není nainstalován program \"smbclient\". Není možné připojení oddílů CIFS/SMB. Prosím požádejte svého správce systému ať jej nainstaluje."
 
-#: lib/config.php:465
+#: lib/config.php:635
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Varování:</b> podpora FTP v PHP není povolena nebo není nainstalována. Není možné připojení oddílů FTP. Prosím požádejte svého správce systému ať ji nainstaluje."
 
-#: lib/config.php:468
+#: lib/config.php:638
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +108,22 @@ msgid "Users"
 msgstr "Uživatelé"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Smazat"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Zapnout externí uživatelské úložiště"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Povolit uživatelům připojení jejich vlastních externích úložišť"
+msgid "Allow users to mount the following external storage"
+msgstr "Povolit uživatelů připojit následující externí úložiště"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Kořenové certifikáty SSL"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importovat kořenového certifikátu"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index ce005893ed..4b4b4e76aa 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # liska_, 2013
-# pstast <petr@stastny.eu>, 2013
+# m23 <black23@gmail.com>, 2014
+# pstast <petr@stastny.eu>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-27 18:36+0000\n"
+"POT-Creation-Date: 2014-03-24 01:55-0400\n"
+"PO-Revision-Date: 2014-03-23 21:50+0000\n"
 "Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +20,10 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Sdílí {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Toto sdílení je chráněno heslem"
@@ -55,32 +60,16 @@ msgstr "sdílení je zakázané"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s s Vámi sdílí složku %s"
+msgid "shared by %s"
+msgstr "sdílí %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s s Vámi sdílí soubor %s"
+msgid "Download %s"
+msgstr "Stáhnout %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Stáhnout"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Odeslat"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Zrušit odesílání"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Náhled není dostupný pro"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Přímý odkaz"
diff --git a/l10n/cs_CZ/files_trashbin.po b/l10n/cs_CZ/files_trashbin.po
index a6242ccbee..cebf39ff8d 100644
--- a/l10n/cs_CZ/files_trashbin.po
+++ b/l10n/cs_CZ/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-24 01:55-0400\n"
+"PO-Revision-Date: 2014-03-23 21:48+0000\n"
+"Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +19,48 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nelze trvale odstranit %s"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Nelze obnovit %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Odstraněné soubory"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Chyba"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "obnoveno"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Žádný obsah. Váš koš je prázdný."
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Název"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Obnovit"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Smazáno"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Smazat"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Smazané soubory"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 7755fd96b2..c1edc97637 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
-# pstast <petr@stastny.eu>, 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: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-24 01:55-0400\n"
+"PO-Revision-Date: 2014-03-23 21:50+0000\n"
+"Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,38 +22,38 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Aplikace \"%s\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Nebyl zadan název aplikace"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Nápověda"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Osobní"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Nastavení"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Uživatelé"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administrace"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Selhala aktualizace verze \"%s\"."
@@ -65,15 +66,10 @@ msgstr "Neznámý typ souboru"
 msgid "Invalid image"
 msgstr "Chybný obrázek"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "webové služby pod Vaší kontrolou"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "nelze otevřít \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Stahování v ZIPu je vypnuto."
@@ -96,74 +92,78 @@ msgid ""
 "administrator."
 msgstr "Prosím stáhněte soubory odděleně po menších množstvích nebo požádejte vašeho správce."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Nebyl zadán zdroj při instalaci aplikace"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Nebyl zadán odkaz pro instalaci aplikace z HTTP"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Nebyla zadána cesta pro instalaci aplikace z místního souboru"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Archivy typu %s nejsou podporovány"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Chyba při otevírání archivu během instalace aplikace"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Aplikace neposkytuje soubor info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací."
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Adresář aplikace již existuje"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Nelze vytvořit složku aplikace. Opravte práva souborů. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Aplikace není povolena"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Chyba ověření"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token vypršel. Obnovte prosím stránku."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Neznámý uživatel"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Soubory"
@@ -197,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 username and/or password not valid"
-msgstr "Uživatelské jméno či heslo MySQL není platné"
+msgid "MySQL/MariaDB username and/or password not valid"
+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\""
@@ -222,30 +222,30 @@ 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\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Uživatel '%s'@'localhost' již v MySQL existuje."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "MySQL/MariaDB uživatel '%s'@'localhost' již existuje."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Zrušte tohoto uživatele z MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Smazat tohoto uživatele z MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Uživatel '%s'@'%%' již v MySQL existuje"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "MySQL/MariaDB uživatel '%s'@'%%' již existuje"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Zrušte tohoto uživatele z MySQL"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Smazat tohoto uživatele z MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -260,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é"
 
@@ -272,70 +272,76 @@ msgstr "Zadejte uživatelské jméno správce."
 msgid "Set an admin password."
 msgstr "Zadejte heslo správce."
 
-#: private/setup.php:195
+#: private/setup.php:202
 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, rozhraní WebDAV se zdá být rozbité."
 
-#: private/setup.php:196
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s s vámi sdílí »%s«"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nelze nalézt kategorii \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "před pár sekundami"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "před %n minutou"
 msgstr[1] "před %n minutami"
 msgstr[2] "před %n minutami"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "před %n hodinou"
 msgstr[1] "před %n hodinami"
 msgstr[2] "před %n hodinami"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "dnes"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "včera"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "před %n dnem"
 msgstr[1] "před %n dny"
 msgstr[2] "před %n dny"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "minulý měsíc"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "před %n měsícem"
 msgstr[1] "před %n měsíci"
 msgstr[2] "před %n měsíci"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "minulý rok"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "před lety"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 488dc267f3..3a2d8b6029 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
-# pstast <petr@stastny.eu>, 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: 2013-12-11 13:31-0500\n"
-"PO-Revision-Date: 2013-12-09 21:50+0000\n"
-"Last-Translator: liska_\n"
+"POT-Creation-Date: 2014-03-28 01:55-0400\n"
+"PO-Revision-Date: 2014-03-27 21:10+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"
@@ -23,6 +24,48 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Uvedena nesprávná hodnota pro %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Uloženo"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "otestovat nastavení e-mailu"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Při odesílání e-mailu nastala chyba. Překontrolujte vaše nastavení."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-mail odeslán"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Mód odesílání"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Šifrování"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Metoda ověření"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Nelze načíst seznam z App Store"
@@ -119,62 +162,90 @@ msgstr "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatel
 msgid "Unable to change password"
 msgstr "Změna hesla se nezdařila"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Odesílání..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Uživatelská dokumentace"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Dokumentace pro administrátory"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Aktualizovat na {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Zakázat"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Povolit"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Čekejte prosím..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Chyba při zakazování aplikace"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Chyba při povolování aplikace"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Aktualizuji..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Chyba při aktualizaci aplikace"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Chyba"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Aktualizováno"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Vyberte profilový obrázek"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Velmi slabé heslo"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Slabé heslo"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Středně silné heslo"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Dobré heslo"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Silné heslo"
+
+#: 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."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Ukládám..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "smazáno"
@@ -187,40 +258,40 @@ msgstr "vrátit zpět"
 msgid "Unable to remove user"
 msgstr "Nelze odebrat uživatele"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Skupiny"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Správa skupiny"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Smazat"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "přidat skupinu"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Musíte zadat platné uživatelské jméno"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Chyba při vytváření užiatele"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Musíte zadat platné heslo"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Varování: Osobní složka uživatele \"{user}\" již existuje."
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Česky"
 
@@ -244,18 +315,42 @@ msgstr "Chyby a fatální problémy"
 msgid "Fatal issues only"
 msgstr "Pouze fatální problémy"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Žádné"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Přihlásit"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Čistý text"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "Správce NT LAN"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Bezpečnostní upozornění"
 
-#: templates/admin.php:25
+#: 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:39
+#: 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 "
@@ -264,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:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Upozornění nastavení"
 
-#: templates/admin.php:53
+#: 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:54
+#: 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:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Schází modul 'fileinfo'"
 
-#: templates/admin.php:68
+#: 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:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
-msgstr "Tato verze PHP je zastaralá."
+msgstr "Vaše verze PHP je zastaralá"
 
-#: templates/admin.php:82
+#: 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 "Tato verze PHP je zastaralá. Důrazně doporučujeme aktualizovat na verzi 5.3.8 nebo novější, protože starší verze jsou chybné. Je možné, že tato instalace nebude fungovat správně."
+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:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokalizace nefunguje"
 
-#: templates/admin.php:98
+#: 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:102
+#: 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:106
+#: 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:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Připojení k internetu nefunguje"
 
-#: templates/admin.php:121
+#: 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 "
@@ -334,118 +429,178 @@ 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:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Poslední cron byl spuštěn v %s."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "Poslední cron byl spuštěn v  %s. To se stalo před více než hodinu. Vypadá to, že není něco v pořádku."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron ještě nebyl spuštěn!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Spustit jednu úlohu s každým načtením stránky"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 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:158
+#: templates/admin.php:200
 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:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Sdílení"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Povolit API sdílení"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Povolit aplikacím používat API sdílení"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Povolit odkazy"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 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:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Povolit veřejné nahrávání souborů"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 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:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Povolit znovu-sdílení"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 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:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Povolit uživatelům sdílet s kýmkoliv"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 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:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Povolit e-mailová upozornění"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 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:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Zabezpečení"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Vynutit HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, 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:242
+#: templates/admin.php:282
 #, 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:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "E-mailový server"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Toto se používá pro odesílání upozornění."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Adresa odesílatele"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Vyžadováno ověření"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Adresa serveru"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Přihlašovací údaje"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "SMTP uživatelské jméno "
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "SMTP heslo"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Otestovat nastavení e-mailu"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Odeslat e-mail"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Úroveň zaznamenávání"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Více"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Méně"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Verze"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -455,30 +610,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Přidat Vaši aplikaci"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Více aplikací"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Vyberte aplikaci"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Dokumentace:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Více na stránce s aplikacemi na apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Prohlédněte si webovou stránku aplikace"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Uživatelská dokumentace"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentace správce"
@@ -512,7 +671,7 @@ msgstr "Znovu zobrazit průvodce prvním spuštěním"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Heslo"
 
@@ -524,151 +683,149 @@ msgstr "Vaše heslo bylo změněno"
 msgid "Unable to change your password"
 msgstr "Změna vašeho hesla se nezdařila"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Současné heslo"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Celé jméno"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Vaše e-mailová adresa"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Pro povolení obnovy hesla vyplňte e-mailovou adresu"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění."
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilový obrázek"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Nahrát nový"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Vyberte nový ze souborů"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Odebrat obrázek"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "png nebo jpg, nejlépe čtvercový, ale budete mít možnost jej oříznout."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Váš avatar je poskytován Vaším původním účtem."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Přerušit"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Zrušit"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Vybrat jako profilový obrázek"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Pomoci s překladem"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Šifrování"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Přihlašovací heslo"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Odšifrovat všechny soubory"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Přihlašovací jméno"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Vytvořit"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Heslo obnovy správce"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Výchozí úložiště"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Neomezeně"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Jiný"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Uživatelské jméno"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Úložiště"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "změnit celé jméno"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "nastavit nové heslo"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Výchozí"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 3e8cc07f1f..f20b90fcd2 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -7,14 +7,14 @@
 # Honza K. <honza889@gmail.com>, 2013
 # liska_, 2013
 # cvanca <mrs.jenkins.oh.yeah@gmail.com>, 2013
-# pstast <petr@stastny.eu>, 2013
+# 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: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
 "Last-Translator: pstast <petr@stastny.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -92,43 +92,43 @@ msgstr "Úspěch"
 msgid "Error"
 msgstr "Chyba"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Konfigurace v pořádku"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Nesprávná konfigurace"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Nekompletní konfigurace"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Vyberte skupiny"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Vyberte objektové třídy"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Vyberte atributy"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Test spojení byl úspěšný"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Test spojení selhal"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Opravdu si přejete smazat současné nastavení serveru?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Potvrdit smazání"
 
@@ -148,11 +148,11 @@ msgstr[0] "nalezen %s uživatel"
 msgstr[1] "nalezeni %s uživatelé"
 msgstr[2] "nalezeno %s uživatelů"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Neplatný hostitel"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Nelze nalézt požadovanou vlastnost"
 
@@ -170,8 +170,8 @@ msgstr "Nápověda"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Omezit přístup k %s skupinám uživatelů splňujícím tyto podmínky:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Skupiny splňující tyto podmínky jsou k dispozici v %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -206,8 +206,8 @@ msgid "groups found"
 msgstr "nalezené skupiny"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Který atribut má být použit jako přihlašovací jméno:"
+msgid "Users login with this attribute:"
+msgstr "Uživatelé se přihlašují s tímto atributem:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -274,8 +274,8 @@ msgstr "V rozšířeném nastavení můžete určit základní DN pro uživatele
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Omezit přístup k %s uživatelům splňujícím tyto podmínky:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Omezit přístup %s uživatelům splňujícím tyto podmínky:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -417,41 +417,51 @@ msgstr "Atributy vyhledávání skupin"
 msgid "Group-Member association"
 msgstr "Asociace člena skupiny"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Vnořené skupiny"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Pokud zapnuto, je možno používat skupiny, které obsahují jiné skupiny. (Funguje pouze pokud atribut člena skupiny obsahuje DN.)"
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Speciální atributy"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Pole pro kvótu"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Výchozí kvóta"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "v bajtech"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Pole e-mailu"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pojmenování domovské složky uživatele"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Interní uživatelské jméno"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -467,15 +477,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména a není potřeba provádět konverzi znaků. Interní uživatelské jméno je omezeno na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením může být výchozí chování změněno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atribut interního uživatelského jména:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Nastavit ručně UUID atribut"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +496,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID atribut pro uživatele:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID atribut pro skupiny:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Mapování uživatelských jmen z LDAPu"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +522,10 @@ msgid ""
 "experimental stage."
 msgstr "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Zrušit mapování uživatelských jmen LDAPu"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Zrušit mapování názvů skupin LDAPu"
diff --git a/l10n/cy_GB/core.po b/l10n/cy_GB/core.po
index 823b769760..68a772c1cb 100644
--- a/l10n/cy_GB/core.po
+++ b/l10n/cy_GB/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -73,91 +59,95 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Sul"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Llun"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Mawrth"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Mercher"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Iau"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Gwener"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sadwrn"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Ionawr"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Chwefror"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mawrth"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Ebrill"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Mehefin"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Gorffennaf"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Awst"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Medi"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Hydref"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Tachwedd"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Rhagfyr"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Yn cadw..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "eiliad yn ôl"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -165,7 +155,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -173,15 +163,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "heddiw"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ddoe"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -189,11 +179,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -201,15 +191,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "misoedd yn ôl"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "y llynedd"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
 
@@ -279,6 +269,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Rhannwyd"
@@ -287,12 +297,12 @@ msgstr "Rhannwyd"
 msgid "Share"
 msgstr "Rhannu"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Gwall"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Gwall wrth rannu"
 
@@ -304,123 +314,123 @@ msgstr "Gwall wrth ddad-rannu"
 msgid "Error while changing permissions"
 msgstr "Gwall wrth newid caniatâd"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Rhannwyd â chi a'r grŵp {group} gan {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Rhannwyd â chi gan {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Diogelu cyfrinair"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "E-bostio dolen at berson"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Anfon"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Gosod dyddiad dod i ben"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Dyddiad dod i ben"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Rhannu drwy e-bost:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Heb ganfod pobl"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grŵp"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Does dim hawl ail-rannu"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Rhannwyd yn {item} â {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Dad-rannu"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "yn gallu golygu"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "rheolaeth mynediad"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "creu"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "diweddaru"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "dileu"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "rhannu"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Diogelwyd â chyfrinair"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Gwall wrth ddad-osod dyddiad dod i ben"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Gwall wrth osod dyddiad dod i ben"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Yn anfon ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Anfonwyd yr e-bost"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Rhybudd"
 
@@ -467,11 +477,17 @@ msgstr "Methodd y diweddariad. Adroddwch y mater hwn i <a href=\"https://github.
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}"
@@ -491,8 +507,8 @@ msgstr "Methodd y cais!<br>Gwiriwch eich enw defnyddiwr ac ebost."
 msgid "You will receive a link to reset your password via Email."
 msgstr "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Enw defnyddiwr"
 
@@ -528,6 +544,18 @@ msgstr "Cyfrinair newydd"
 msgid "Reset password"
 msgstr "Ailosod cyfrinair"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personol"
@@ -536,7 +564,7 @@ msgstr "Personol"
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Pecynnau"
 
@@ -646,49 +674,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crewch <strong>gyfrif gweinyddol</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Uwch"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Plygell data"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Cyflunio'r gronfa ddata"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "ddefnyddir"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Defnyddiwr cronfa ddata"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Cyfrinair cronfa ddata"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Enw cronfa ddata"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tablespace cronfa ddata"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Gwesteiwr cronfa ddata"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Gorffen sefydlu"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -704,7 +730,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Allgofnodi"
 
@@ -730,27 +756,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Wedi colli'ch cyfrinair?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "cofio"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Mewngofnodi"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Mewngofnodiadau Amgen"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/cy_GB/files.po b/l10n/cy_GB/files.po
index e32823fc6d..f9ca4e1117 100644
--- a/l10n/cy_GB/files.po
+++ b/l10n/cy_GB/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,202 +17,215 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Methwyd symud %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Does dim hawl cael enw ffeil gwag."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ni lwythwyd ffeil i fyny. Gwall anhysbys."
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb MAX_FILE_SIZE bennwyd yn y ffurflen HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dim ond yn rhannol y llwythwyd y ffeil i fyny"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Ni lwythwyd ffeil i fyny"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Plygell dros dro yn eisiau"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Methwyd ysgrifennu i'r ddisg"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Dim digon o le storio ar gael"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Cyfeiriadur annilys."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Ffeiliau"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Dim digon o le ar gael"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Diddymwyd llwytho i fyny."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Mae ffeiliau'n cael eu llwytho i fyny. Bydd gadael y dudalen hon nawr yn diddymu'r broses."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} yn bodoli'n barod"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Rhannu"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Dileu'n barhaol"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Ailenwi"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "I ddod"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "newidiwyd {new_name} yn lle {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "dadwneud"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
@@ -220,7 +233,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
@@ -228,11 +241,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
@@ -240,66 +253,60 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "Mae '.' yn enw ffeil annilys."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Mae eich storfa'n llawn, ni ellir diweddaru a chydweddu ffeiliau mwyach!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Mae eich storfa bron a bod yn llawn ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Wrthi'n paratoi i lwytho i lawr. Gall gymryd peth amser os yw'r ffeiliau'n fawr."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Gwall"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Enw"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Maint"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Addaswyd"
 
@@ -307,12 +314,12 @@ msgstr "Addaswyd"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Llwytho i fyny"
 
@@ -348,72 +355,68 @@ msgstr "Maint mewnbynnu mwyaf ffeiliau ZIP"
 msgid "Save"
 msgstr "Cadw"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Newydd"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Ffeil destun"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Plygell"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Dolen o"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ffeiliau ddilewyd"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Diddymu llwytho i fyny"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Llwytho i lawr"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Dileu"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Maint llwytho i fyny'n rhy fawr"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Mae'r ffeiliau rydych yn ceisio llwytho i fyny'n fwy na maint mwyaf llwytho ffeiliau i fyny ar y gweinydd hwn."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Arhoswch, mae ffeiliau'n cael eu sganio."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Sganio cyfredol"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Uwchraddio storfa system ffeiliau..."
diff --git a/l10n/cy_GB/files_encryption.po b/l10n/cy_GB/files_encryption.po
index e589c2e5a9..07ded87631 100644
--- a/l10n/cy_GB/files_encryption.po
+++ b/l10n/cy_GB/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,18 +81,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -100,9 +100,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Yn cadw..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/cy_GB/files_external.po b/l10n/cy_GB/files_external.po
index 2c221863a0..91af8d7530 100644
--- a/l10n/cy_GB/files_external.po
+++ b/l10n/cy_GB/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Defnyddwyr"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Dileu"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/cy_GB/files_sharing.po b/l10n/cy_GB/files_sharing.po
index bf2fd67f99..68b808a855 100644
--- a/l10n/cy_GB/files_sharing.po
+++ b/l10n/cy_GB/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "Rhannodd %s blygell %s â chi"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "Rhannodd %s ffeil %s â chi"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Llwytho i lawr"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Llwytho i fyny"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Diddymu llwytho i fyny"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Does dim rhagolwg ar gael ar gyfer"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/cy_GB/files_trashbin.po b/l10n/cy_GB/files_trashbin.po
index 26381b9c86..9d13eee108 100644
--- a/l10n/cy_GB/files_trashbin.po
+++ b/l10n/cy_GB/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Methwyd dileu %s yn barhaol"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Methwyd adfer %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Ffeiliau ddilewyd"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Gwall"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Does dim byd yma. Mae eich bin sbwriel yn wag!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Enw"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Adfer"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Wedi dileu"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Dileu"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Ffeiliau Ddilewyd"
diff --git a/l10n/cy_GB/lib.po b/l10n/cy_GB/lib.po
index e87c4c5b4d..60f778e312 100644
--- a/l10n/cy_GB/lib.po
+++ b/l10n/cy_GB/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Cymorth"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personol"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Gweinyddu"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "gwasanaethau gwe a reolir gennych"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Mae llwytho ZIP wedi ei ddiffodd."
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Nid yw'r pecyn wedi'i alluogi"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Gwall dilysu"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Tocyn wedi dod i ben. Ail-lwythwch y dudalen."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Ffeiliau"
@@ -199,8 +198,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Enw a/neu gyfrinair MySQL annilys"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -227,21 +226,21 @@ msgstr "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Defnyddiwr MySQL '%s'@'localhost' yn bodoli eisoes."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Gollwng y defnyddiwr hwn o MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Gollwng y defnyddiwr hwn o MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -268,27 +267,33 @@ msgstr "Creu enw defnyddiwr i'r gweinyddwr."
 msgid "Set an admin password."
 msgstr "Gosod cyfrinair y gweinyddwr."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Methu canfod categori \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "eiliad yn ôl"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
@@ -296,7 +301,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
@@ -304,15 +309,15 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "heddiw"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ddoe"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
@@ -320,11 +325,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "mis diwethaf"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
@@ -332,10 +337,10 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "y llynedd"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "blwyddyn yn ôl"
diff --git a/l10n/cy_GB/settings.po b/l10n/cy_GB/settings.po
index 71b634b40d..d9646c0cc2 100644
--- a/l10n/cy_GB/settings.po
+++ b/l10n/cy_GB/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: cy_GB\n"
 "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Anfonwyd yr e-bost"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Amgryptiad"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Gwall"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Yn cadw..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "dadwneud"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grwpiau"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Dileu"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Dim"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Mewngofnodi"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Rhybudd Diogelwch"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Cyfrinair"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Cyfrinair newydd"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-bost"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Diddymu"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Amgryptiad"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "Mewngofnodi"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Arall"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Enw defnyddiwr"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/cy_GB/user_ldap.po b/l10n/cy_GB/user_ldap.po
index f32a619a70..cc9dff4f5d 100644
--- a/l10n/cy_GB/user_ldap.po
+++ b/l10n/cy_GB/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Welsh (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/cy_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Gwall"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -144,11 +144,11 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -166,7 +166,7 @@ msgstr "Cymorth"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -202,7 +202,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -270,7 +270,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -413,41 +413,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -463,15 +473,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -482,19 +492,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -508,10 +518,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 8ef32c0b7b..352b90b2cf 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Sappe, 2013
+# Sappe, 2013-2014
 # claus_chr <claus_chr@webspeed.dk>, 2013
 # kaffeldt <kasper.affeldt@gmail.com>, 2013
 # lodahl <leiflodahl@gmail.com>, 2013
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-08 01:55-0500\n"
-"PO-Revision-Date: 2014-01-07 08:50+0000\n"
-"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>\n"
+"POT-Creation-Date: 2014-03-25 01:55-0400\n"
+"PO-Revision-Date: 2014-03-24 11:00+0000\n"
+"Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +24,11 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s delte »%s« med sig"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Kunne ikke sende mail til følgende brugere: %s"
@@ -46,19 +45,6 @@ msgstr "standsede vedligeholdelsestilstand"
 msgid "Updated database"
 msgstr "Opdaterede database"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Opdatere filcache, dette kan tage rigtigt lang tid..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Opdaterede filcache"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% færdig ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ingen fil eller billede givet"
@@ -79,135 +65,139 @@ msgstr "Intet midlertidigt profilbillede tilgængeligt, prøv igen"
 msgid "No crop data provided"
 msgstr "Ingen beskæringsdata give"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Mandag"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Marts"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "December"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:872
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Gemmer..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:873
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut siden"
 msgstr[1] "%n minutter siden"
 
-#: js/js.js:874
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time siden"
 msgstr[1] "%n timer siden"
 
-#: js/js.js:875
+#: js/js.js:998
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:876
+#: js/js.js:999
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:877
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dage siden"
 
-#: js/js.js:878
+#: js/js.js:1001
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:879
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n måned siden"
 msgstr[1] "%n måneder siden"
 
-#: js/js.js:880
+#: js/js.js:1003
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:881
+#: js/js.js:1004
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:882
+#: js/js.js:1005
 msgid "years ago"
 msgstr "år siden"
 
@@ -275,6 +265,26 @@ msgstr "({count} valgt)"
 msgid "Error loading file exists template"
 msgstr "Fejl ved inlæsning af; fil eksistere skabelon"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Meget svagt kodeord"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Svagt kodeord"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Jævnt kodeord"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Godt kodeord"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Stærkt kodeord"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Delt"
@@ -283,12 +293,12 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fejl"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fejl under deling"
 
@@ -300,123 +310,123 @@ msgstr "Fejl under annullering af deling"
 msgid "Error while changing permissions"
 msgstr "Fejl under justering af rettigheder"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med dig og gruppen {group} af {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Delt med dig af {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Del med bruger eller gruppe ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Del link"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Kodeord"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Tillad Offentlig Upload"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "E-mail link til person"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Vælg udløbsdato"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Udløbsdato"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Del via email:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Ingen personer fundet"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Videredeling ikke tilladt"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "Giv besked med mail"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "kan redigere"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "Adgangskontrol"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "opret"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "opdater"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "slet"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "del"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Beskyttet med adgangskode"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udløbsdato"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fejl under sætning af udløbsdato"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sender ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail afsendt"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -463,11 +473,17 @@ msgstr "Opdateringen blev ikke udført korrekt. Rapporter venligst problemet til
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s adgangskode nulstillet"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Der opstod et problem under afsending af emailen. Kontakt venligst systemadministratoren."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Anvend følgende link til at nulstille din adgangskode: {link}"
@@ -487,8 +503,8 @@ msgstr "Anmodning mislykkedes!<br>Er du sikker på at din e-post / brugernavn va
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du vil modtage et link til at nulstille dit kodeord via email."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Brugernavn"
 
@@ -524,6 +540,18 @@ msgstr "Nyt kodeord"
 msgid "Reset password"
 msgstr "Nulstil kodeord"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personligt"
@@ -532,7 +560,7 @@ msgstr "Personligt"
 msgid "Users"
 msgstr "Brugere"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -642,49 +670,47 @@ msgstr "For information om, hvordan du konfigurerer din server korrekt se <a hre
 msgid "Create an <strong>admin account</strong>"
 msgstr "Opret en <strong>administratorkonto</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avanceret"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Lager & database"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "vil blive brugt"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasebruger"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Databasekodeord"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Navn på database"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Database tabelplads"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Databasehost"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Færdigbehandler ..."
 
@@ -700,7 +726,7 @@ msgstr "Programmet forudsætter at JavaScript er aktiveret for at kunne afvikles
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgængelig. Få mere information om, hvordan du opdaterer."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Log ud"
 
@@ -726,28 +752,28 @@ msgstr "Server side godkendelse mislykkedes!"
 msgid "Please contact your administrator."
 msgstr "Kontakt venligst din administrator"
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Mistet dit kodeord?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Log ind"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternative logins"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hej med dig,<br><br>Dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det her!</a><br><br>Hej"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 53216837a8..16d923ac96 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -3,17 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Sappe, 2013
+# Sappe, 2013-2014
 # claus_chr <claus_chr@webspeed.dk>, 2013
 # lodahl <leiflodahl@gmail.com>, 2013
+# Amplificator, 2014
 # Ole Holm Frandsen <froksen@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 18:50+0000\n"
-"Last-Translator: lodahl <leiflodahl@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,283 +22,290 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Kunne ikke flytte %s - der findes allerede en fil med dette navn"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Kunne ikke flytte %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Filnavnet kan ikke stå tomt."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Filnavnet må ikke indeholde \"/\". Vælg venligst et andet navn."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" er et ugyldigt filnavn."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "Mappen er blevet slettet eller fjernet."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Navnet %s er allerede i brug i mappen %s. Vælg venligst et andet navn."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Ikke en gyldig kilde"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Server har ikke tilladelse til at åbne URL'er. Kontroller venligst serverens indstillinger"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Fejl ved hentning af %s til %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Fejl ved oprettelse af fil"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Mappenavnet kan ikke være tomt."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Mappenavnet må ikke indeholde \"/\". Vælg venligst et andet navn."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Fejl ved oprettelse af mappen"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Ude af stand til at vælge upload mappe."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Ugyldig Token "
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Der skete ingen fejl, filen blev succesfuldt uploadet"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filen blev kun delvist uploadet."
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Ingen fil uploadet"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Manglende midlertidig mappe."
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Fejl ved skrivning til disk."
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Der er ikke nok plads til rådlighed"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Upload fejlede. Kunne ikke hente filinformation."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload fejlede. Kunne ikke finde den uploadede fil."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Upload fejlede. Kunne ikke hente filinformation."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes."
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "ikke nok tilgængelig ledig plads "
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Kunne ikke hente resultat fra server."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL kan ikke være tom"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Navnet 'Shared' er reserveret i hjemmemappen."
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Kunne ikke oprette fil"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Kunne ikke oprette mappe"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Fejl ved URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Del"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Slet permanent"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Omdøb"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Kunne ikke omdøbe filen"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Fejl ved sletnign af fil."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} og {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploader %n fil"
 msgstr[1] "Uploader %n filer"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' er et ugyldigt filnavn."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "'{name}' er et ugyldigt filnavn."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ugyldig privat nøgle for krypteringsprogrammet. Opdater venligst dit kodeord for den private nøgle i dine personlige indstillinger. Det kræves for at få adgang til dine krypterede filer."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. "
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dit download forberedes. Dette kan tage lidt tid ved større filer."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Fejl ved flytning af fil"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Fejl"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Ændret"
 
@@ -305,12 +313,12 @@ msgstr "Ændret"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Ugyldig mappenavn. 'Shared' er reserveret."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s kunne ikke omdøbes"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Upload"
 
@@ -346,72 +354,68 @@ msgstr "Maksimal størrelse på ZIP filer"
 msgid "Save"
 msgstr "Gem"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Ny tekstfil"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Tekstfil"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Ny Mappe"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Slettede filer"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Du har ikke tilladelse til at uploade eller oprette filer her"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Upload er for stor"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlæst, vent venligst."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Indlæser"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Opgraderer filsystems cachen..."
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index 90861c46ca..83a7a04974 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Sappe, 2013
+# Sappe, 2013-2014
 # claus_chr <claus_chr@webspeed.dk>, 2013
 # lodahl <leiflodahl@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 18:40+0000\n"
-"Last-Translator: lodahl <leiflodahl@gmail.com>\n"
+"POT-Creation-Date: 2014-03-13 01:55-0400\n"
+"PO-Revision-Date: 2014-03-12 12:00+0000\n"
+"Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,18 +83,18 @@ msgid ""
 "administrator"
 msgstr "Ukendt fejl. Kontroller venligst dit system eller kontakt din administrator"
 
-#: hooks/hooks.php:62
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Manglende betingelser."
 
-#: hooks/hooks.php:63
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret."
 
-#: hooks/hooks.php:281
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Følgende brugere er ikke sat op til kryptering:"
 
@@ -102,9 +102,9 @@ msgstr "Følgende brugere er ikke sat op til kryptering:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Førstegangskryptering er påbegyndt... Dette kan tage nogen tid. Vent venligst."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Gemmer..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Kryptering foretages... Prøv venligst igen senere."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index c51e65b554..e7dde82ddc 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Amplificator, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-19 23:12+0000\n"
+"Last-Translator: Amplificator\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +18,44 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Adgang godkendt"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Fejl ved konfiguration af Dropbox plads"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Godkend adgang"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Angiv venligst en valid Dropbox app nøgle og hemmelighed"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Fejl ved konfiguration af Google Drive plads"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Gemt"
+
+#: lib/config.php:518
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b> Advarsel: </ b> \"smbclient\" ikke er installeret. Montering af CIFS / SMB delinger er ikke muligt. Spørg din systemadministrator om at installere det."
 
-#: lib/config.php:465
+#: lib/config.php:522
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b> Advarsel: </ b> FTP-understøttelse i PHP ikke er aktiveret eller installeret. Montering af FTP delinger er ikke muligt. Spørg din systemadministrator om at installere det."
 
-#: lib/config.php:468
+#: lib/config.php:525
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +107,22 @@ msgid "Users"
 msgstr "Brugere"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Aktiver ekstern opbevaring for brugere"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Tillad brugere at montere deres egne eksterne opbevaring"
+msgid "Allow users to mount the following external storage"
+msgstr "Tillad brugere at montere følgende som eksternt lager"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL-rodcertifikater"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importer rodcertifikat"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 54b706c403..a1f254615e 100644
--- a/l10n/da/files_sharing.po
+++ b/l10n/da/files_sharing.po
@@ -5,13 +5,14 @@
 # Translators:
 # Sappe, 2013
 # lodahl <leiflodahl@gmail.com>, 2013
+# Amplificator, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 16:20+0000\n"
-"Last-Translator: lodahl <leiflodahl@gmail.com>\n"
+"POT-Creation-Date: 2014-03-24 01:55-0400\n"
+"PO-Revision-Date: 2014-03-23 18:20+0000\n"
+"Last-Translator: Amplificator\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +20,10 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Delt af {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Delingen er beskyttet af kodeord"
@@ -55,32 +60,16 @@ msgstr "deling er deaktiveret"
 msgid "For more info, please ask the person who sent this link."
 msgstr "For yderligere information, kontakt venligst personen der sendte linket. "
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s delte mappen %s med dig"
+msgid "shared by %s"
+msgstr "delt af %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s delte filen %s med dig"
+msgid "Download %s"
+msgstr "Download %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Download"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Upload"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Fortryd upload"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Forhåndsvisning ikke tilgængelig for"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Direkte link"
diff --git a/l10n/da/files_trashbin.po b/l10n/da/files_trashbin.po
index 4524e08cf2..1c4ac09da9 100644
--- a/l10n/da/files_trashbin.po
+++ b/l10n/da/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +19,48 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kunne ikke slette %s permanent"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gendanne %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Slettede filer"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Fejl"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "Gendannet"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Intet at se her. Din papirkurv er tom!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Navn"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Gendan"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Slettet"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Slettede filer"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 94320b42d8..b0a5605312 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Sappe, 2013
+# Sappe, 2013-2014
 # claus_chr <claus_chr@webspeed.dk>, 2013
 # lodahl <leiflodahl@gmail.com>, 2013
 # Ole Holm Frandsen <froksen@gmail.com>, 2013
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 16:01+0000\n"
-"Last-Translator: lodahl <leiflodahl@gmail.com>\n"
+"POT-Creation-Date: 2014-03-25 01:55-0400\n"
+"PO-Revision-Date: 2014-03-24 11:30+0000\n"
+"Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,38 +21,38 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "App'en \"%s\" kan ikke blive installeret, da den ikke er kompatibel med denne version af ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Intet app-navn angivet"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hjælp"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personligt"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Brugere"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Upgradering af \"%s\" fejlede"
@@ -65,15 +65,10 @@ msgstr "Ukendt filtype"
 msgid "Invalid image"
 msgstr "Ugyldigt billede"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "Kan ikke åbne \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP-download er slået fra."
@@ -96,74 +91,78 @@ msgid ""
 "administrator."
 msgstr "Hent venligst filerne hver for sig i mindre dele eller spørg din administrator."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Ingen kilde angivet under installation af app"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Ingen href angivet under installation af app via http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Ingen sti angivet under installation af app fra lokal fil"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Arkiver af type %s understøttes ikke"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Kunne ikke åbne arkiv under installation af appen"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Der følger ingen info.xml-fil med appen"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Appen kan ikke installeres, da den indeholder ikke-tilladt kode"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud."
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende apps"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "App-mappe findes allerede"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Kan ikke oprette app-mappe. Ret tilladelser. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Programmet er ikke aktiveret"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Adgangsfejl"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Adgang er udløbet. Genindlæs siden."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Ukendt bruger"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Filer"
@@ -197,23 +196,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %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 "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL brugernavn og/eller kodeord er ikke gyldigt."
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "Ugyldigt MySQL/MariaDB brugernavn og/eller kodeord "
 
 #: 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 "Databasefejl: \"%s\""
@@ -222,30 +221,30 @@ msgstr "Databasefejl: \"%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 "Fejlende kommando var: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL brugeren '%s'@'localhost' eksisterer allerede."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "MySQL/MariaDB bruger '%s'@'localhost' eksistere allerede."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Slet denne bruger fra MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Slet denne bruger fra MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL brugeren '%s'@'%%' eksisterer allerede."
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "MySQL/MariaDB bruger '%s'@'%%' eksistere allerede"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Slet denne bruger fra MySQL"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Drop denne bruger fra MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -260,7 +259,7 @@ msgstr "Oracle brugernavn og/eller kodeord er ikke gyldigt."
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Fejlende kommando var: \"%s\", navn: %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 brugernavn og/eller kodeord er ikke gyldigt."
 
@@ -272,66 +271,72 @@ msgstr "Angiv et admin brugernavn."
 msgid "Set an admin password."
 msgstr "Angiv et admin kodeord."
 
-#: private/setup.php:195
+#: private/setup.php:202
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
 
-#: private/setup.php:196
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s delte »%s« med sig"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kunne ikke finde kategorien \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut siden"
 msgstr[1] "%n minutter siden"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time siden"
 msgstr[1] "%n timer siden"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "i dag"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "i går"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dage siden"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "sidste måned"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n måned siden"
 msgstr[1] "%n måneder siden"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "sidste år"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "år siden"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 9b91fc8745..ecc1285414 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Sappe, 2013
+# Sappe, 2013-2014
 # lodahl <leiflodahl@gmail.com>, 2013
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2013
 # Ole Holm Frandsen <froksen@gmail.com>, 2013
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 16:40+0000\n"
-"Last-Translator: lodahl <leiflodahl@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 09:30+0000\n"
+"Last-Translator: Sappe\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +21,48 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Gemt"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "test email indstillinger"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-mail afsendt"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Kunne ikke indlæse listen fra App Store"
@@ -117,62 +159,90 @@ msgstr "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnø
 msgid "Unable to change password"
 msgstr "Kunne ikke ændre kodeord"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Sender..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Brugerdokumentation"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Administrator Dokumentation"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Opdatér til {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Deaktiver"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aktiver"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Vent venligst..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Kunne ikke deaktivere app"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Kunne ikke aktivere app"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Opdaterer...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Der opstod en fejl under app opgraderingen"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Fejl"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Opdater"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Opdateret"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Vælg et profilbillede"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Meget svagt kodeord"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Svagt kodeord"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Jævnt kodeord"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Godt kodeord"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Stærkt kodeord"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekryptere filer... Vent venligst, dette kan tage lang tid. "
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Gemmer..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "Slettet"
@@ -185,40 +255,40 @@ msgstr "fortryd"
 msgid "Unable to remove user"
 msgstr "Kan ikke fjerne bruger"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Gruppe Administrator"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Slet"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "Tilføj gruppe"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Et gyldigt brugernavn skal angives"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Fejl ved oprettelse af bruger"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "En gyldig adgangskode skal angives"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Dansk"
 
@@ -242,18 +312,42 @@ msgstr "Fejl og alvorlige fejl"
 msgid "Fatal issues only"
 msgstr "Kun alvorlige fejl"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ingen"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Login"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "NT LAN Manager"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sikkerhedsadvarsel"
 
-#: templates/admin.php:25
+#: 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 "Du tilgår %s via HTTP. Vi anbefaler at du konfigurerer din server til i stedet at kræve HTTPS."
 
-#: templates/admin.php:39
+#: 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 "
@@ -262,68 +356,68 @@ msgid ""
 "root."
 msgstr "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod.  "
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Opsætnings Advarsel"
 
-#: templates/admin.php:53
+#: 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 "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' mangler"
 
-#: templates/admin.php:68
+#: 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 "PHP modulet 'fileinfo' mangler. Vi anbefaler stærkt at aktivere dette modul til at få de bedste resultater med mime-type detektion."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Din PHP-version er forældet"
 
-#: templates/admin.php:82
+#: 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 "Din PHP-version er forældet. Vi anbefaler at du opgraderer til 5.3.8 eller nyere, fordi ældre versioner har kendte fejl. Det er derfor muligt at installationen ikke fungerer korrekt."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Landestandard fungerer ikke"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Systemets locale kan ikke sættes til et der bruger UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Det betyder at der kan være problemer med visse tegn i filnavne."
 
-#: templates/admin.php:106
+#: 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 "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Internetforbindelse fungerer ikke"
 
-#: templates/admin.php:121
+#: 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 "
@@ -332,118 +426,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informationsemails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Udføre en opgave med hver side indlæst"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Brug systemets cron service til at kalde cron.php hvert 15. minut."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktiver Share API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Tillad apps til at bruge Share API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Tillad links"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Tillad brugere at dele elementer til offentligheden med links"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Tillad offentlig upload"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Tillad brugere at give andre mulighed for at uploade i deres offentligt delte mapper"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Tillad videredeling"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Tillad brugere at dele elementer delt med dem igen"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Tillad brugere at dele med alle"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillad brugere at kun dele med brugerne i deres grupper"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Tillad mail underretninger"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Tillad brugere at sende mail underretninger for delte filer"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sikkerhed"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Gennemtving HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tving klienten til at forbinde til %s via en kryptetet forbindelse."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Email Server"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Fra adresse"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Godkendelse påkrævet"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Serveradresse"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Brugeroplysninger"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "SMTP Brugernavn"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "SMTP Kodeord"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Test email indstillinger"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Send email"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mere"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -453,30 +607,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Tilføj din App"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Flere Apps"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Vælg en App"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Dokumentation:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikationens side på apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Brugerdokumentation"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administrator Dokumentation"
@@ -510,7 +668,7 @@ msgstr "Vis Første Kørsels Guiden igen."
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Kodeord"
 
@@ -522,151 +680,149 @@ msgstr "Din adgangskode blev ændret"
 msgid "Unable to change your password"
 msgstr "Ude af stand til at ændre dit kodeord"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Nuværende adgangskode"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nyt kodeord"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Skift kodeord"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Fulde navn"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Din emailadresse"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Indtast en emailadresse for at kunne få påmindelse om adgangskode"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilbillede"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Upload nyt"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Vælg nyt fra Filer"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Fjern billede"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. "
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Din avatar kommer fra din oprindelige konto."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Afbryd"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Annuller"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Vælg som profilbillede"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Sprog"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Hjælp med oversættelsen"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Kryptering"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Log-in kodeord"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Dekrypter alle Filer "
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Loginnavn"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Ny"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Administrator gendannelse kodeord"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Standard opbevaring"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ubegrænset"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Andet"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Brugernavn"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Opbevaring"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "ændre fulde navn"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "skift kodeord"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 1012e98413..91bc2bece8 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +87,43 @@ msgstr "Succes"
 msgid "Error"
 msgstr "Fejl"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Vælg grupper"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Forbindelsestest lykkedes"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Forbindelsestest mislykkedes"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ønsker du virkelig at slette den nuværende Server Konfiguration?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Bekræft Sletning"
 
@@ -141,11 +141,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -163,7 +163,7 @@ msgstr "Hjælp"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -199,7 +199,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -267,7 +267,7 @@ msgstr "You can specify Base DN for users and groups in the Advanced tab"
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -410,41 +410,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kvote Felt"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Email Felt"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Internt Brugernavn"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +470,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +489,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +515,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index c3ee3e52b2..471f29b8a0 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -4,20 +4,21 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
-# I Robot <owncloud-bot@tmit.eu>, 2013
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
+# I Robot, 2013
+# Marcel Kühlhorn <tux93@opensuse.org>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # JamFX <niko@nik-o-mat.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
 # Pwnicorn <pwnicorndev@gmail.com>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:22+0000\n"
+"POT-Creation-Date: 2014-03-23 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 10:50+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -26,12 +27,11 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s teilte »%s« mit Dir"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "Ablaufdatum liegt in der Vergangenheit."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s"
@@ -48,19 +48,6 @@ msgstr "Wartungsmodus ausgeschaltet"
 msgid "Updated database"
 msgstr "Datenbank aktualisiert"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Aktualisiere Dateicache, dies könnte eine Weile dauern..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Dateicache aktualisiert"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% erledigt ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Kein Bild oder Datei zur Verfügung gestellt"
@@ -81,135 +68,139 @@ msgstr "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal"
 msgid "No crop data provided"
 msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "März"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Speichern..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -277,6 +268,26 @@ msgstr "({count} ausgewählt)"
 msgid "Error loading file exists template"
 msgstr "Fehler beim Laden der vorhanden Dateivorlage"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Sehr schwaches Passwort"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Schwaches Passwort"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Durchschnittliches Passwort"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Gutes Passwort"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Starkes Passwort"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Geteilt"
@@ -285,12 +296,12 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -302,123 +313,123 @@ msgstr "Fehler beim Aufheben der Freigabe"
 msgid "Error while changing permissions"
 msgstr "Fehler beim Ändern der Rechte"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} hat dies mit Dir und der Gruppe {group} geteilt"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner} hat dies mit Dir geteilt"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Mit Benutzer oder Gruppe teilen ...."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Link Teilen"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Setze ein Ablaufdatum"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Über eine E-Mail teilen:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Für {user} in {item} freigegeben"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "Per E-Mail informieren"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Durch ein Passwort geschützt"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Warnung"
 
@@ -465,11 +476,17 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s-Passwort zurücksetzen"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Beim Senden der E-Mail ist ein Fehler aufgetreten, bitte kontaktiere deinen Administrator."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}"
@@ -489,8 +506,8 @@ msgstr "Anfrage fehlgeschlagen!<br>Hast Du darauf geachtet, dass Deine E-Mail/De
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Benutzername"
 
@@ -526,6 +543,18 @@ msgstr "Neues Passwort"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Persönlich"
@@ -534,7 +563,7 @@ msgstr "Persönlich"
 msgid "Users"
 msgstr "Benutzer"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -644,49 +673,47 @@ msgstr "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bit
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Fortgeschritten"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Speicher & Datenbank"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "wird verwendet"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Abschließen ..."
 
@@ -702,7 +729,7 @@ msgstr "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betri
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -728,28 +755,28 @@ msgstr "Serverseitige Authentifizierung fehlgeschlagen!"
 msgid "Please contact your administrator."
 msgstr "Bitte kontaktiere Deinen Administrator."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hallo,<br/><br/>wollte Dich nur kurz informieren, dass %s gerade %s mit Dir geteilt hat.<br/><a href=\"%s\">Schau es Dir an.</a><br/><br/>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Hallo,<br><br>wir möchten dich nur wissen lassen, dass %s <strong>%s</strong> mit dir geteilt hat.<br><a href=\"%s\">Ansehen!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 628bdcb0c9..d6ab1aa210 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -3,19 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# I Robot <owncloud-bot@tmit.eu>, 2013
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# I Robot, 2013
+# I Robot, 2014
+# Marcel Kühlhorn <tux93@opensuse.org>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
 # Pwnicorn <pwnicorndev@gmail.com>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # kabum <uu.kabum@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,283 +25,290 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Konnte %s nicht verschieben"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Der Dateiname darf nicht leer sein."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Der Dateiname darf kein \"/\" enthalten. Bitte wähle einen anderen Namen."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" ist kein gültiger Dateiname."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "Der Zielordner wurde verschoben oder gelöscht."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Der Name %s wird bereits im Ordner %s benutzt. Bitte wähle  einen anderen Namen."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Keine gültige Quelle"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Fehler beim Herunterladen von %s nach %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Fehler beim Erstellen der Datei"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Der Ordner-Name darf nicht leer sein."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Der Ordner-Name darf kein \"/\" enthalten. Bitte wähle einen anderen Namen."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Fehler beim Erstellen des Ordners"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Das Upload-Verzeichnis konnte nicht gesetzt werden."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Ungültiges Merkmal"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Die Datei ist größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML-Formular spezifiziert ist"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei konnte nur teilweise übertragen werden"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Nicht genug Speicherplatz verfügbar"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar."
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "Die URL darf nicht leer sein"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Das Benutzerverzeichnis 'Shared' ist ein reservierter Dateiname"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Die Datei konnte nicht erstellt werden"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Der Ordner konnte nicht erstellt werden"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Fehler beim Abrufen der URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Teilen"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Die Datei konnte nicht umbenannt werden"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Fehler beim Löschen der Datei."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} und {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hochgeladen"
 msgstr[1] "%n Dateien werden hochgeladen"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' ist kein gültiger Dateiname."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" ist kein gültiger Dateiname."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Dein Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Die Verschlüsselung-App ist aktiviert, aber Deine Schlüssel sind nicht initialisiert. Bitte melden Dich nochmals ab und wieder an."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisiere Dein privates Schlüssel-Passwort, um den Zugriff auf Deine verschlüsselten Dateien wiederherzustellen."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Deine Dateien nach wie vor verschlüsselt. Bitte gehe zu Deinen persönlichen Einstellungen, um Deine Dateien zu entschlüsseln."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Dein Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Fehler beim Verschieben der Datei"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Geändert"
 
@@ -307,12 +316,12 @@ msgstr "Geändert"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von 'Shared' ist reserviert."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -348,72 +357,68 @@ msgstr "Maximale Größe für ZIP-Dateien"
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Neue Textdatei"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Neuer Ordner"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Scanne"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 46d897d070..241666d088 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -8,6 +8,7 @@
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
 # Pwnicorn <pwnicorndev@gmail.com>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # thillux, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
@@ -15,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-06 10:50+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 11:00+0000\n"
+"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,18 +89,18 @@ msgid ""
 "administrator"
 msgstr "Unbekannter Fehler, bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Fehlende Vorraussetzungen"
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
 
-#: hooks/hooks.php:278
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 
@@ -107,9 +108,9 @@ msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Speichern..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Initiale Verschlüsselung läuft... Bitte versuche es später wieder."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 961094281a..68b7ecc4b2 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 11:00+0000\n"
+"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +19,44 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Zugriff gestattet"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Fehler beim Einrichten von Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Zugriff gestatten"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Gespeichert"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitte Deinen System-Administrator, dies zu installieren."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wende Dich an Deinen Systemadministrator."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +108,22 @@ msgid "Users"
 msgstr "Benutzer"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Externen Speicher für Benutzer aktivieren"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
+msgid "Allow users to mount the following external storage"
+msgstr "Erlaube es Benutzern, den folgenden externen Speicher einzubinden"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL-Root-Zertifikate"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index dd4cb3df2b..dadab0a198 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -5,15 +5,16 @@
 # Translators:
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # Pwnicorn <pwnicorndev@gmail.com>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # Susi <>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-06 10:50+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 15:50+0000\n"
+"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +22,10 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Geteilt von {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Diese Freigabe ist durch ein Passwort geschützt"
@@ -57,32 +62,16 @@ msgstr "Teilen ist deaktiviert"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Für mehr Informationen, frage bitte die Person, die Dir diesen Link geschickt hat."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s hat den Ordner %s mit Dir geteilt"
+msgid "shared by %s"
+msgstr "Freigegeben von %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s hat die Datei %s mit Dir geteilt"
+msgid "Download %s"
+msgstr "Download %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Download"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Upload"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Upload abbrechen"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Es ist keine Vorschau verfügbar für"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Direkter Link"
diff --git a/l10n/de/files_trashbin.po b/l10n/de/files_trashbin.po
index 4fc104f2c0..074fcb68e5 100644
--- a/l10n/de/files_trashbin.po
+++ b/l10n/de/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: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-06 10:48+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\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"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,21 +18,25 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Konnte %s nicht dauerhaft löschen"
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Gelöschte Dateien"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Fehler"
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "Wiederhergestellt"
 
@@ -56,6 +60,6 @@ msgstr "gelöscht"
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Gelöschte Dateien"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 3a4258bd22..70f1e16ede 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -5,15 +5,16 @@
 # Translators:
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # ninov <ninovdl@ymail.com>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 11:00+0000\n"
+"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,38 +22,38 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Es wurde kein Applikation-Name angegeben"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hilfe"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Persönlich"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Benutzer"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administration"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Konnte \"%s\" nicht aktualisieren."
@@ -65,15 +66,10 @@ msgstr "Unbekannter Dateityp"
 msgid "Invalid image"
 msgstr "Ungültiges Bild"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Web-Services unter Deiner Kontrolle"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "Öffnen von \"%s\" fehlgeschlagen"
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
@@ -96,74 +92,78 @@ msgid ""
 "administrator."
 msgstr "Bitte lade die Dateien einzeln in kleineren Teilen herunter oder bitte Deinen Administrator."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Für die Installation der Applikation wurde keine Quelle angegeben"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Für die Installation der Applikation über http wurde keine Quelle (href) angegeben"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Archive vom Typ %s werden nicht unterstützt"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Die Applikation enthält keine info,xml Datei"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Die Applikation kann auf Grund von unerlaubtem Code nicht installiert werden"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist."
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Das Applikationsverzeichnis existiert bereits"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Es kann kein Applikationsordner erstellt werden. Bitte passe die  Berechtigungen an. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Die Anwendung ist nicht aktiviert"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Fehler bei der Anmeldung"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token abgelaufen. Bitte lade die Seite neu."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Unbekannter Benutzer"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Dateien"
@@ -203,8 +203,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL Benutzername und/oder Passwort ungültig"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -231,21 +231,21 @@ msgstr "Fehlerhafter Befehl war: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Lösche diesen Benutzer von MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Lösche diesen Benutzer von MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Lösche diesen Benutzer aus MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Lösche diesen Benutzer von MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -272,66 +272,72 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s teilte »%s« mit Dir"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Die Kategorie \"%s\" konnte nicht gefunden werden."
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "Heute"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "Gestern"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "Vor Jahren"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 2824738323..b120125988 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -4,9 +4,11 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
+# I Robot, 2014
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # ninov <ninovdl@ymail.com>, 2013
 # Pwnicorn <pwnicorndev@gmail.com>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
@@ -14,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-05 22:23-0500\n"
-"PO-Revision-Date: 2013-12-05 13:20+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 11:50+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +26,48 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Ungültiger Wert für %s übermittelt"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Gespeichert"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "E-Mail-Einstellungen teste"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen"
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-Mail wurde verschickt"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Sende-Modus"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Authentifizierungsmethode"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
@@ -120,62 +164,90 @@ msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzer
 msgid "Unable to change password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Sende..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Dokumentation für Benutzer"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Admin-Dokumentation"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Aktualisiere zu {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Bitte warten..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Beim Aktivieren der Applikation ist ein Fehler aufgetreten"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Aktualisierung..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Fehler beim Aktualisieren der App"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Aktualisierung durchführen"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Wähle ein Profilbild"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Sehr schwaches Passwort"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Schwaches Passwort"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Durchschnittliches Passwort"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Gutes Passwort"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Starkes Passwort"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Speichern..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "gelöscht"
@@ -188,40 +260,40 @@ msgstr "rückgängig machen"
 msgid "Unable to remove user"
 msgstr "Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Beim Anlegen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Deutsch (Persönlich)"
 
@@ -245,18 +317,42 @@ msgstr "Fehler und fatale Probleme"
 msgid "Fatal issues only"
 msgstr "Nur fatale Probleme"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Nichts"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Anmelden"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Plain"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "NT LAN Manager"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sicherheitswarnung"
 
-#: templates/admin.php:25
+#: 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 "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, das stattdessen HTTPS verlangt wird."
 
-#: templates/admin.php:39
+#: 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 "
@@ -265,68 +361,68 @@ msgid ""
 "root."
 msgstr "Dein Datenverzeichnis und deine Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Einrichtungswarnung"
 
-#: templates/admin.php:53
+#: 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 "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr "Bitte überprüfe die <a href=\"%s\">Installationsanleitungen</a>."
+msgstr "Bitte prüfe nochmals die <a href=\"%s\">Installationsanleitungen</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modul 'fileinfo' fehlt "
 
-#: templates/admin.php:68
+#: 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 "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Deine PHP-Version ist veraltet"
 
-#: templates/admin.php:82
+#: 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 "Deine PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Ländereinstellung funktioniert nicht"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann."
 
-#: templates/admin.php:106
+#: 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 "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Keine Netzwerkverbindung"
 
-#: templates/admin.php:121
+#: 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 "
@@ -335,118 +431,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Letzter Cron wurde um %s ausgeführt."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron wurde bis jetzt noch nicht ausgeführt!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Führe eine Aufgabe mit jeder geladenen Seite aus"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Benutze den System-Crondienst um die cron.php alle 15 Minuten aufzurufen."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktiviere Sharing-API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Erlaubt Apps die Nutzung der Share-API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Erlaubt Links"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
-msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
+msgstr "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Erlaubt erneutes Teilen"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Benutzern ihrer Gruppe zu teilen"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Mail-Benachrichtigung erlauben"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Erzwinge HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
+msgstr "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "E-Mail-Server"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Dies wird zum Senden von Benachrichtigungen verwendet."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Absender-Adresse"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Authentifizierung benötigt"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Adresse des Servers"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Zugangsdaten"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "SMTP Benutzername"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "SMTP Passwor"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Teste E-Mail-Einstellunge"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Sende E-Mail"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Loglevel"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -456,30 +612,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Füge Deine Anwendung hinzu"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Wähle eine Anwendung aus"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Dokumentation:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen findest Du auf apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Siehe Anwendungs-Website"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Dokumentation für Benutzer"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentation für Administratoren"
@@ -511,9 +671,9 @@ msgstr "Erstinstallation erneut durchführen"
 #: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>"
+msgstr "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passwort"
 
@@ -525,151 +685,149 @@ msgstr "Dein Passwort wurde geändert."
 msgid "Unable to change your password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Deine E-Mail-Adresse"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Gib eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilbild"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Neues hochladen"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Neues aus den Dateien wählen"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Bild entfernen"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Dein Avatar wird von Deinem ursprünglichenKonto verwendet."
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Als Profilbild wählen"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Hilf bei der Übersetzung"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Verschlüsselung"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten."
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Login-Passwort"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Alle Dateien entschlüsseln"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Loginname"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Anlegen"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Admin-Wiederherstellungspasswort"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Benutzername"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "Vollständigen Namen ändern"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "Neues Passwort setzen"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index c060c23562..61ce5eaac6 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Marcel Kühlhorn <tux93@opensuse.org>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # Pwnicorn <pwnicorndev@gmail.com>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,43 +90,43 @@ msgstr "Erfolgreich"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Konfiguration OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Konfiguration nicht korrekt"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Konfiguration nicht vollständig"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Wähle Gruppen aus"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Objekt-Klassen auswählen"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Attribute auswählen"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Verbindungstest erfolgreich"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Verbindungstest fehlgeschlagen"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Löschung bestätigen"
 
@@ -144,11 +144,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s Benutzer gefunden"
 msgstr[1] "%s Benutzer gefunden"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Ungültiger Host"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Konnte die gewünschte Funktion nicht finden"
 
@@ -166,8 +166,8 @@ msgstr "Hilfe"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Beschränke den Zugriff auf %s auf Gruppen, die die folgenden Kriterien erfüllen:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Gruppen-Versammlungen mit diesen Kriterien sind verfügbar in %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -202,8 +202,8 @@ msgid "groups found"
 msgstr "Gruppen gefunden"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Welches Attribut soll als Login-Name verwendet werden:"
+msgid "Users login with this attribute:"
+msgstr "Nutzeranmeldung mit diesem Merkmal:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -270,8 +270,8 @@ msgstr "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Beschränke den Zugriff auf %s auf Benutzer, die die folgenden Kriterien erfüllen:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -413,41 +413,51 @@ msgstr "Gruppensucheigenschaften"
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Eingebundene Gruppen"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)"
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kontingent Feld"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Standard Kontingent"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "E-Mail Feld"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Interner Benutzername"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -463,15 +473,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Attribut für interne Benutzernamen:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "UUID-Erkennung überschreiben"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -482,19 +492,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lasse es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID-Attribute für Benutzer:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID-Attribute für Gruppen:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -508,10 +518,10 @@ msgid ""
 "experimental stage."
 msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Lösche die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Lösche LDAP-Gruppennamenzuordnung"
diff --git a/l10n/de_AT/core.po b/l10n/de_AT/core.po
index 43986ced25..1134976fb2 100644
--- a/l10n/de_AT/core.po
+++ b/l10n/de_AT/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# I Robot <owncloud-bot@tmit.eu>, 2013
+# I Robot, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -73,135 +59,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
-msgid "Sunday"
-msgstr ""
-
-#: js/config.php:33
-msgid "Monday"
-msgstr ""
-
-#: js/config.php:34
-msgid "Tuesday"
-msgstr ""
-
-#: js/config.php:35
-msgid "Wednesday"
-msgstr ""
-
 #: js/config.php:36
-msgid "Thursday"
-msgstr ""
+msgid "Sunday"
+msgstr "Sonntag"
 
 #: js/config.php:37
-msgid "Friday"
-msgstr ""
+msgid "Monday"
+msgstr "Montag"
 
 #: js/config.php:38
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: js/config.php:41
+msgid "Friday"
+msgstr "Freitag"
+
+#: js/config.php:42
 msgid "Saturday"
-msgstr ""
-
-#: js/config.php:43
-msgid "January"
-msgstr ""
-
-#: js/config.php:44
-msgid "February"
-msgstr ""
-
-#: js/config.php:45
-msgid "March"
-msgstr ""
-
-#: js/config.php:46
-msgid "April"
-msgstr ""
+msgstr "Samstag"
 
 #: js/config.php:47
-msgid "May"
-msgstr ""
+msgid "January"
+msgstr "Januar"
 
 #: js/config.php:48
-msgid "June"
-msgstr ""
+msgid "February"
+msgstr "Februar"
 
 #: js/config.php:49
-msgid "July"
-msgstr ""
+msgid "March"
+msgstr "März"
 
 #: js/config.php:50
-msgid "August"
-msgstr ""
+msgid "April"
+msgstr "April"
 
 #: js/config.php:51
-msgid "September"
-msgstr ""
+msgid "May"
+msgstr "Mai"
 
 #: js/config.php:52
-msgid "October"
-msgstr ""
+msgid "June"
+msgstr "Juni"
 
 #: js/config.php:53
-msgid "November"
-msgstr ""
+msgid "July"
+msgstr "Juli"
 
 #: js/config.php:54
+msgid "August"
+msgstr "August"
+
+#: js/config.php:55
+msgid "September"
+msgstr "September"
+
+#: js/config.php:56
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:57
+msgid "November"
+msgstr "November"
+
+#: js/config.php:58
 msgid "December"
-msgstr ""
+msgstr "Dezember"
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
+msgstr "Einstellungen"
+
+#: js/js.js:496
+msgid "Saving..."
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -251,7 +241,7 @@ msgstr ""
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
-msgstr ""
+msgstr "Abbrechen"
 
 #: js/oc-dialogs.js:386
 msgid "Continue"
@@ -269,20 +259,40 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
 
 #: js/share.js:109
 msgid "Share"
-msgstr ""
+msgstr "Freigeben"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -294,123 +304,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
-msgstr ""
+msgstr "Gruppe"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
-msgstr ""
+msgstr "Teilung zurücknehmen"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
-msgstr ""
+msgstr "kann bearbeiten"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -424,7 +434,7 @@ msgstr ""
 
 #: js/tags.js:27
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
 #: js/tags.js:31
 msgid "Add"
@@ -457,11 +467,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -481,8 +497,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -518,15 +534,27 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "Persönlich"
 
 #: strings.php:6
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -636,49 +664,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -694,7 +720,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -720,27 +746,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/de_AT/files.po b/l10n/de_AT/files.po
index bb1821599c..1cff24b0de 100644
--- a/l10n/de_AT/files.po
+++ b/l10n/de_AT/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
-msgstr ""
+msgstr "Freigeben"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -340,74 +347,70 @@ msgstr ""
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
-msgstr ""
+msgstr "Herunterladen"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/de_AT/files_encryption.po b/l10n/de_AT/files_encryption.po
index 418f50879b..7cd4e354cf 100644
--- a/l10n/de_AT/files_encryption.po
+++ b/l10n/de_AT/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/de_AT/files_external.po b/l10n/de_AT/files_external.po
index 8eaf2edc15..9f85e31f08 100644
--- a/l10n/de_AT/files_external.po
+++ b/l10n/de_AT/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-07 08:59-0400\n"
-"PO-Revision-Date: 2013-08-07 09:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"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"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:448
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:451
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:454
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/de_AT/files_sharing.po b/l10n/de_AT/files_sharing.po
index 1e23d2030d..6835f39be3 100644
--- a/l10n/de_AT/files_sharing.po
+++ b/l10n/de_AT/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -27,7 +31,7 @@ msgstr ""
 
 #: templates/authenticate.php:10
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/de_AT/files_trashbin.po b/l10n/de_AT/files_trashbin.po
index 9f2eb2716b..03100b293f 100644
--- a/l10n/de_AT/files_trashbin.po
+++ b/l10n/de_AT/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/de_AT/lib.po b/l10n/de_AT/lib.po
index 49d351f3f8..535f8b9b15 100644
--- a/l10n/de_AT/lib.po
+++ b/l10n/de_AT/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
-msgstr ""
+msgstr "Persönlich"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/de_AT/settings.po b/l10n/de_AT/settings.po
index 4c5a8ee9bc..567f670a46 100644
--- a/l10n/de_AT/settings.po
+++ b/l10n/de_AT/settings.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# I Robot <owncloud-bot@tmit.eu>, 2013
+# I Robot, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: de_AT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -65,7 +107,7 @@ msgstr ""
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr ""
+msgstr "Fehlerhafte Anfrage"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -114,60 +156,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -182,40 +252,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
-msgstr ""
+msgstr "Löschen"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Deutsch (Österreich)"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Adresse des Servers"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,28 +604,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -507,9 +665,9 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
 #: templates/personal.php:40
 msgid "Your password was changed"
@@ -519,151 +677,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
-msgstr ""
+msgstr "E-Mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
-msgstr ""
+msgstr "Anderes"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/de_AT/user_ldap.po b/l10n/de_AT/user_ldap.po
index 132de651d9..1e86832a9e 100644
--- a/l10n/de_AT/user_ldap.po
+++ b/l10n/de_AT/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Austria) (http://www.transifex.com/projects/p/owncloud/language/de_AT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -60,7 +60,7 @@ msgstr ""
 
 #: js/settings.js:67
 msgid "Deletion failed"
-msgstr ""
+msgstr "Löschen fehlgeschlagen"
 
 #: js/settings.js:83
 msgid "Take over settings from recent server configuration?"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,17 +140,17 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
 #: templates/part.settingcontrols.php:2
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #: templates/part.settingcontrols.php:4
 msgid "Test Configuration"
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -250,7 +250,7 @@ msgstr ""
 
 #: templates/part.wizard-server.php:52
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
 #: templates/part.wizard-server.php:53
 msgid "For anonymous access, leave DN and Password empty."
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/de_CH/core.po b/l10n/de_CH/core.po
index deb192be2d..bb41b4f03b 100644
--- a/l10n/de_CH/core.po
+++ b/l10n/de_CH/core.po
@@ -6,20 +6,20 @@
 # arkascha <foss@christian-reiner.info>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
-# I Robot <owncloud-bot@tmit.eu>, 2013
+# I Robot, 2013
 # kenwood <kenwood@gmx.ch>, 2013
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Marcel Kühlhorn <tux93@opensuse.org>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 # SteinQuadrat, 2013
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# traductor, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,12 +27,11 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s teilt »%s« mit Ihnen"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -49,19 +48,6 @@ msgstr "Wartungsmodus ausgeschaltet"
 msgid "Updated database"
 msgstr "Datenbank aktualisiert"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Aktualisiere Dateicache, dies könnte eine Weile dauern..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Dateicache aktualisiert"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -82,135 +68,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "März"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Speichern..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -278,6 +268,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Geteilt"
@@ -286,12 +296,12 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -303,123 +313,123 @@ msgstr "Fehler beim Aufheben der Freigabe"
 msgid "Error while changing permissions"
 msgstr "Fehler bei der Änderung der Rechte"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Von {owner} mit Ihnen geteilt."
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Ein Ablaufdatum setzen"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail teilen:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Passwortgeschützt"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Warnung"
 
@@ -466,11 +476,17 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s-Passwort zurücksetzen"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}"
@@ -490,8 +506,8 @@ msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adress
 msgid "You will receive a link to reset your password via Email."
 msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Benutzername"
 
@@ -527,6 +543,18 @@ msgstr "Neues Passwort"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Persönlich"
@@ -535,7 +563,7 @@ msgstr "Persönlich"
 msgid "Users"
 msgstr "Benutzer"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -645,49 +673,47 @@ msgstr "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Fortgeschritten"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "wird verwendet"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Installation abschliessen"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -703,7 +729,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -729,27 +755,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/de_CH/files.po b/l10n/de_CH/files.po
index 3d90c347be..223375e7fa 100644
--- a/l10n/de_CH/files.po
+++ b/l10n/de_CH/files.po
@@ -6,19 +6,19 @@
 # a.tangemann <a.tangemann@web.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
-# I Robot <owncloud-bot@tmit.eu>, 2013
+# I Robot, 2013
 # kabum <uu.kabum@gmail.com>, 2013
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Marcel Kühlhorn <tux93@opensuse.org>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 # SteinQuadrat, 2013
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# traductor, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,283 +26,290 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits."
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Konnte %s nicht verschieben"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Der Dateiname darf nicht leer sein."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Das Upload-Verzeichnis konnte nicht gesetzt werden."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Ungültiges Merkmal"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Die Datei ist grösser, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei konnte nur teilweise übertragen werden"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Nicht genügend Speicherplatz verfügbar"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Teilen"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hochgeladen"
 msgstr[1] "%n Dateien werden hochgeladen"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' ist kein gültiger Dateiname."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Ungültiger Name, «\\», «/», «<», «>», «:», «\"», «|», «?» und «*» sind nicht zulässig."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei grösseren Dateien etwas dauern."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Grösse"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Geändert"
 
@@ -310,12 +317,12 @@ msgstr "Geändert"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -351,72 +358,68 @@ msgstr "Maximale Grösse für ZIP-Dateien"
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Neues Verzeichnis"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Der Upload ist zu gross"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Scanne"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_CH/files_encryption.po b/l10n/de_CH/files_encryption.po
index ca208fe78d..e0ff909df6 100644
--- a/l10n/de_CH/files_encryption.po
+++ b/l10n/de_CH/files_encryption.po
@@ -8,14 +8,14 @@
 # FlorianScholz <work@bgstyle.de>, 2013
 # JamFX <niko@nik-o-mat.de>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
-# traductor <transifex-2.7.mensaje@spamgourmet.com>, 2013
+# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,18 +86,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Fehlende Voraussetzungen"
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 
@@ -105,9 +105,9 @@ msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Speichern..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/de_CH/files_external.po b/l10n/de_CH/files_external.po
index bf326e50f9..7d5e063fd8 100644
--- a/l10n/de_CH/files_external.po
+++ b/l10n/de_CH/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: FlorianScholz <work@bgstyle.de>\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"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Zugriff gestattet"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Fehler beim Einrichten von Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Zugriff gestatten"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Warnung:</b> «smbclient» ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Benutzer"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Externen Speicher für Benutzer aktivieren"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL-Root-Zertifikate"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de_CH/files_sharing.po b/l10n/de_CH/files_sharing.po
index 3bf4f2e30f..4e72d18d6a 100644
--- a/l10n/de_CH/files_sharing.po
+++ b/l10n/de_CH/files_sharing.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Geteilt von {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -56,32 +60,16 @@ msgstr "Teilen ist deaktiviert"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s hat den Ordner %s mit Ihnen geteilt"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s hat die Datei %s mit Ihnen geteilt"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Herunterladen"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Hochladen"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Upload abbrechen"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Es ist keine Vorschau verfügbar für"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/de_CH/files_trashbin.po b/l10n/de_CH/files_trashbin.po
index 0e522a2028..6e38b3848b 100644
--- a/l10n/de_CH/files_trashbin.po
+++ b/l10n/de_CH/files_trashbin.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,44 +20,48 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Konnte %s nicht dauerhaft löschen"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Gelöschte Dateien"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Fehler"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "Wiederhergestellt"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Name"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Gelöschte Dateien"
diff --git a/l10n/de_CH/lib.po b/l10n/de_CH/lib.po
index 60b3f52c35..0694cb8609 100644
--- a/l10n/de_CH/lib.po
+++ b/l10n/de_CH/lib.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,38 +21,38 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Anwendung \"%s\" kann nicht installiert werden, da sie mit dieser Version von ownCloud nicht kompatibel ist."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Kein App-Name spezifiziert"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hilfe"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Persönlich"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Benutzer"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administrator"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Konnte \"%s\" nicht aktualisieren."
@@ -65,15 +65,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "Öffnen von \"%s\" fehlgeschlagen"
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
@@ -96,74 +91,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Anwendung kann wegen nicht erlaubten Codes nicht installiert werden"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Anwendungsverzeichnis existiert bereits"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Die Anwendung ist nicht aktiviert"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Authentifizierungs-Fehler"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token abgelaufen. Bitte laden Sie die Seite neu."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Dateien"
@@ -203,8 +202,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL Benutzername und/oder Passwort ungültig"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -231,21 +230,21 @@ msgstr "Fehlerhafter Befehl war: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Lösche diesen Benutzer aus MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Lösche diesen Benutzer aus MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -272,66 +271,72 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s teilt »%s« mit Ihnen"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Die Kategorie «%s» konnte nicht gefunden werden."
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "Vor %n Minuten"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "Vor %n Stunden"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "Heute"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "Gestern"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "Vor %n Tagen"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "Vor %n Monaten"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "Vor  Jahren"
diff --git a/l10n/de_CH/settings.po b/l10n/de_CH/settings.po
index 8d29ca8730..a57d5b69ac 100644
--- a/l10n/de_CH/settings.po
+++ b/l10n/de_CH/settings.po
@@ -7,18 +7,18 @@
 # a.tangemann <a.tangemann@web.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
-# I Robot <owncloud-bot@tmit.eu>, 2013
+# I Robot, 2013
 # kabum <uu.kabum@gmail.com>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# traductor, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,6 +26,48 @@ msgstr ""
 "Language: de_CH\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email gesendet"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
@@ -122,62 +164,90 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Dokumentation für Benutzer"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Update zu {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Bitte warten...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Fehler während der Deaktivierung der Anwendung"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Fehler während der Aktivierung der Anwendung"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Update..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Es ist ein Fehler während des Updates aufgetreten"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Update durchführen"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Speichern..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "gelöscht"
@@ -190,40 +260,40 @@ msgstr "rückgängig machen"
 msgid "Unable to remove user"
 msgstr "Der Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Deutsch (Schweiz)"
 
@@ -247,18 +317,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Anmelden"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sicherheitshinweis"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -267,68 +361,68 @@ msgid ""
 "root."
 msgstr "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Einrichtungswarnung"
 
-#: templates/admin.php:53
+#: 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 "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Bitte überprüfen Sie die <a href=\"%s\">Instalationsanleitungen</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Das Modul 'fileinfo' fehlt"
 
-#: templates/admin.php:68
+#: 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 "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Die Lokalisierung funktioniert nicht"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Keine Internetverbindung"
 
-#: templates/admin.php:121
+#: 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 "
@@ -337,118 +431,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Eine Aufgabe bei jedem Laden der Seite ausführen"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Share-API aktivieren"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Erlaube öffentliches hochladen"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Adresse des Servers"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -458,30 +612,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Fügen Sie Ihre Anwendung hinzu"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Wählen Sie eine Anwendung aus"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Dokumentation für Benutzer"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentation für Administratoren"
@@ -515,7 +673,7 @@ msgstr "Den Einrichtungsassistenten erneut anzeigen"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passwort"
 
@@ -527,151 +685,149 @@ msgstr "Ihr Passwort wurde geändert."
 msgid "Unable to change your password"
 msgstr "Das Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Helfen Sie bei der Übersetzung"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Verschlüsselung"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Login-Passwort"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Alle Dateien entschlüsseln"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Loginname"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Erstellen"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Admin-Passwort-Wiederherstellung"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Benutzername"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "Neues Passwort setzen"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/de_CH/user_ldap.po b/l10n/de_CH/user_ldap.po
index e5935ea789..14344bc7b1 100644
--- a/l10n/de_CH/user_ldap.po
+++ b/l10n/de_CH/user_ldap.po
@@ -7,17 +7,17 @@
 # FlorianScholz <work@bgstyle.de>, 2013
 # FlorianScholz <work@bgstyle.de>, 2013
 # JamFX <niko@nik-o-mat.de>, 2013
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# Marcel Kühlhorn <tux93@opensuse.org>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # multimill <multimill@gmail.com>, 2012
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2012-2013
+# traductor, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/owncloud/language/de_CH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,43 +94,43 @@ msgstr "Erfolg"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Wähle Gruppen"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Verbindungstest erfolgreich"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Verbindungstest fehlgeschlagen"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Löschung bestätigen"
 
@@ -148,11 +148,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgstr "Hilfe"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -206,7 +206,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -274,7 +274,7 @@ msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reit
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -417,41 +417,51 @@ msgstr "Gruppensucheigenschaften"
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kontingent-Feld"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Standard-Kontingent"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "E-Mail-Feld"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Interner Benutzername"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -467,15 +477,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Interne Eigenschaften des Benutzers:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "UUID-Erkennung überschreiben"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -486,19 +496,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -512,10 +522,10 @@ msgid ""
 "experimental stage."
 msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Lösche LDAP-Gruppennamenzuordnung"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index d5844a27ad..16a7061e93 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -5,19 +5,22 @@
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
 # SteinQuadrat, 2013
-# I Robot <owncloud-bot@tmit.eu>, 2013
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# I Robot, 2013
+# I Robot, 2014
+# lysathor, 2014
+# Marcel Kühlhorn <tux93@opensuse.org>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
+# traductor, 2013
 # noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-23 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 10:50+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +28,11 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s hat »%s« mit Ihnen geteilt"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "Ablaufdatum liegt in der Vergangenheit."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "An folgende Benutzer konnte keine E-Mail gesendet werden: %s"
@@ -47,22 +49,9 @@ msgstr "Wartungsmodus ausgeschaltet"
 msgid "Updated database"
 msgstr "Datenbank aktualisiert"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Aktualisiere Datei-Cache, dies könnte eine Weile dauern..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Datei-Cache aktualisiert"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% erledigt ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
-msgstr "Kein Bild oder Datei zur Verfügung gestellt"
+msgstr "Weder Bild noch ein Datei wurden zur Verfügung gestellt"
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
@@ -80,135 +69,139 @@ msgstr "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal"
 msgid "No crop data provided"
 msgstr "Keine Zuschnittdaten zur Verfügung gestellt"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Montag"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Freitag"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Samstag"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "März"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Speichern..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -276,6 +269,26 @@ msgstr "({count} ausgewählt)"
 msgid "Error loading file exists template"
 msgstr "Fehler beim Laden der vorhanden Dateivorlage"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Sehr schwaches Passwort"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Schwaches Passwort"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Passables Passwort"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Gutes Passwort"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Starkes Passwort"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Geteilt"
@@ -284,12 +297,12 @@ msgstr "Geteilt"
 msgid "Share"
 msgstr "Teilen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fehler"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fehler beim Teilen"
 
@@ -301,123 +314,123 @@ msgstr "Fehler beim Aufheben der Freigabe"
 msgid "Error while changing permissions"
 msgstr "Fehler bei der Änderung der Rechte"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Von {owner} mit Ihnen und der Gruppe {group} geteilt."
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Von {owner} mit Ihnen geteilt."
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Mit Benutzer oder Gruppe teilen ...."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Link teilen"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Ein Ablaufdatum setzen"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail teilen:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "Gruppe"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "Per E-Mail informieren"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "teilen"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Passwortgeschützt"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email gesendet"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Warnung"
 
@@ -464,11 +477,17 @@ msgstr "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s-Passwort zurücksetzen"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Beim Senden der E-Mail ist ein Problem aufgetreten, bitte kontaktieren Sie Ihren Administrator."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}"
@@ -488,8 +507,8 @@ msgstr "Anfrage fehlgeschlagen!<br>Haben Sie darauf geachtet, dass E-Mail-Adress
 msgid "You will receive a link to reset your password via Email."
 msgstr "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Benutzername"
 
@@ -525,6 +544,18 @@ msgstr "Neues Passwort"
 msgid "Reset password"
 msgstr "Passwort zurücksetzen"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Persönlich"
@@ -533,7 +564,7 @@ msgstr "Persönlich"
 msgid "Users"
 msgstr "Benutzer"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -637,55 +668,53 @@ msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet a
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihr Server richtig konfigurieren können."
+msgstr "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können."
 
 #: templates/installation.php:48
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Fortgeschritten"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Speicher & Datenbank"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "wird verwendet"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Abschließen ..."
 
@@ -701,7 +730,7 @@ msgstr "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betri
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -727,28 +756,28 @@ msgstr "Die Authentifizierung auf dem Server ist fehlgeschlagen!"
 msgid "Please contact your administrator."
 msgstr "Bitte kontaktieren Sie Ihren Administrator."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Einloggen"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hallo,<br><br>%s hat %s mit Ihnen geteilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Hallo,<br><br>wir möchten Sie wissen lassen, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Ansehen</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 4dfeb00de5..5e50b0b468 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -5,10 +5,12 @@
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
 # SteinQuadrat, 2013
-# I Robot <owncloud-bot@tmit.eu>, 2013
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013
+# I Robot, 2013
+# I Robot, 2014
+# Marcel Kühlhorn <tux93@opensuse.org>, 2013
 # Mario Siegmann <mario_siegmann@web.de>, 2013
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
+# traductor, 2013
 # noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
@@ -16,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,283 +28,290 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "%s konnte nicht verschoben werden. Eine Datei mit diesem Namen existiert bereits."
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Konnte %s nicht verschieben"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Der Dateiname darf nicht leer sein."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Der Dateiname darf kein \"/\" enthalten. Bitte wählen Sie einen anderen Namen."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" ist kein gültiger Dateiname."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "Der Ziel-Ordner wurde verschoben oder gelöscht."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Der Name %s wird bereits im Ordner %s benutzt. Bitte wählen Sie einen anderen Namen."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Keine gültige Quelle"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Fehler beim Herunterladen von %s nach %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Fehler beim Erstellen der Datei"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Der Ordner-Name darf nicht leer sein."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Der Ordner-Name darf kein \"/\" enthalten. Bitte wählen Sie einen anderen Namen."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Fehler beim Erstellen des Ordners"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Das Upload-Verzeichnis konnte nicht gesetzt werden."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Ungültiges Merkmal"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Es ist kein Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Die Datei ist größer, als die MAX_FILE_SIZE Vorgabe erlaubt, die im HTML-Formular spezifiziert ist"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei konnte nur teilweise übertragen werden"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Keine Datei konnte übertragen werden."
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Kein temporärer Ordner vorhanden"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Hochladen fehlgeschlagen. Die hochgeladene Datei konnte nicht gefunden werden."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Ungültiges Verzeichnis."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Nicht genügend Speicherplatz verfügbar"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar."
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Ergebnis konnte nicht vom Server abgerufen werden."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "Die URL darf nicht leer sein"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Das Benutzerverzeichnis 'Shared' ist ein reservierter Dateiname"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Die Datei konnte nicht erstellt werden"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Der Ordner konnte nicht erstellt werden"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Fehler beim Abrufen der URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Teilen"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Endgültig löschen"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Die Datei konnte nicht umbenannt werden"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Fehler beim Löschen der Datei."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n Ordner"
 msgstr[1] "%n Ordner"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n Datei"
 msgstr[1] "%n Dateien"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} und {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n Datei wird hoch geladen"
 msgstr[1] "%n Dateien werden hoch geladen"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' ist kein gültiger Dateiname."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" ist kein gültiger Dateiname."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden sich nochmals ab und wieder an."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ungültiger privater Schlüssel für die Verschlüsselung-App. Bitte aktualisieren Sie Ihr privates Schlüssel-Passwort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ihr Download wird vorbereitet. Dies kann bei größeren Dateien etwas dauern."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Fehler beim Verschieben der Datei"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Geändert"
 
@@ -310,12 +319,12 @@ msgstr "Geändert"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Ungültiger Verzeichnisname. Die Nutzung von 'Shared' ist reserviert."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s konnte nicht umbenannt werden"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Hochladen"
 
@@ -351,72 +360,68 @@ msgstr "Maximale Größe für ZIP-Dateien"
 msgid "Save"
 msgstr "Speichern"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Neu"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Neue Textdatei"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Textdatei"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
-msgstr "Neues Verzeichnis"
+msgstr "Neues Ordner"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Ordner"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Gelöschte Dateien"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Laden Sie etwas hoch!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Scanne"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Dateisystem-Cache wird aktualisiert ..."
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index d6ec6d43f9..17029f21ab 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # ako84 <a0306265@unet.univie.ac.at>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # JamFX <niko@nik-o-mat.de>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-11-29 19:30+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 13:31+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -84,28 +85,28 @@ msgid ""
 "administrator"
 msgstr "Unbekannter Fehler, bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Fehlende Voraussetzungen"
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten."
+msgstr "Anfangsverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Speichern..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Anfangsverschlüsselung läuft... Bitte versuchen Sie es später wieder."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index fab43fb0db..7e0969deb0 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # arkascha <foss@christian-reiner.info>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # Mirodin <blobbyjj@ymail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 11:00+0000\n"
+"Last-Translator: stefanniedermann <stefan.niedermann@googlemail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,40 +20,44 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Zugriff gestattet"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Fehler beim Einrichten von Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Zugriff gestatten"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Gespeichert"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Warnung:</b> \"smbclient\" ist nicht installiert. Das Einhängen von CIFS/SMB-Freigaben ist nicht möglich. Bitten Sie Ihren Systemadministrator, dies zu installieren."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Warnung::</b> Die FTP Unterstützung  von PHP ist nicht aktiviert oder installiert. Bitte wenden Sie sich an Ihren Systemadministrator."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -104,22 +109,22 @@ msgid "Users"
 msgstr "Benutzer"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Externen Speicher für Benutzer aktivieren"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Erlaubt Benutzern, ihre eigenen externen Speicher einzubinden"
+msgid "Allow users to mount the following external storage"
+msgstr "Erlauben Sie Benutzern, folgende externe Speicher einzubinden"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL-Root-Zertifikate"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de_DE/files_sharing.po b/l10n/de_DE/files_sharing.po
index 971d8177eb..fc0d2176be 100644
--- a/l10n/de_DE/files_sharing.po
+++ b/l10n/de_DE/files_sharing.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# I Robot, 2014
 # Mario Siegmann <mario_siegmann@web.de>, 2013
 # JamFX <niko@nik-o-mat.de>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 22:00+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +21,10 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Geteilt von {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Diese Freigabe ist durch ein Passwort geschützt"
@@ -55,32 +61,16 @@ msgstr "Teilen ist deaktiviert"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s hat den Ordner %s mit Ihnen geteilt"
+msgid "shared by %s"
+msgstr "Geteilt von %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s hat die Datei %s mit Ihnen geteilt"
+msgid "Download %s"
+msgstr "Download %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Herunterladen"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Hochladen"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Upload abbrechen"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Es ist keine Vorschau verfügbar für"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Direkte Verlinkung"
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po
index 2348bee919..29d7687f4f 100644
--- a/l10n/de_DE/files_trashbin.po
+++ b/l10n/de_DE/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +19,48 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Konnte %s nicht dauerhaft löschen"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Konnte %s nicht wiederherstellen"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Gelöschte Dateien"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Fehler"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "Wiederhergestellt"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nichts zu löschen, Ihr Papierkorb ist leer!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Name"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Gelöschte Dateien"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 25b901469e..9bd58decbd 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -4,15 +4,17 @@
 # 
 # Translators:
 # Mario Siegmann <mario_siegmann@web.de>, 2013
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
 # traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
 # noxin <transifex.com@davidmainzer.com>, 2013
+# kabum <uu.kabum@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 21:54+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,38 +22,38 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Applikation \"%s\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Es wurde kein Applikation-Name angegeben"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hilfe"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Persönlich"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Benutzer"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administrator"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Konnte \"%s\" nicht aktualisieren."
@@ -64,15 +66,10 @@ msgstr "Unbekannter Dateityp"
 msgid "Invalid image"
 msgstr "Ungültiges Bild"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "Öffnen von \"%s\" fehlgeschlagen"
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
@@ -95,74 +92,78 @@ msgid ""
 "administrator."
 msgstr "Bitte laden Sie die Dateien einzeln in kleineren Teilen herunter oder bitten Sie Ihren Administrator."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Für die Installation der Applikation wurde keine Quelle angegeben"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Archive des Typs %s werden nicht unterstützt."
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
-msgstr "Die Applikation enthält keine info,xml Datei"
+msgstr "Die Applikation enthält keine info.xml Datei"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist."
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Der Ordner für die Anwendung existiert bereits."
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Die Anwendung ist nicht aktiviert"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Authentifizierungs-Fehler"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token abgelaufen. Bitte laden Sie die Seite neu."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Unbekannter Benutzer"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Dateien"
@@ -202,8 +203,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL Benutzername und/oder Passwort ungültig"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -230,21 +231,21 @@ msgstr "Fehlerhafter Befehl war: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL Benutzer '%s'@'localhost' existiert bereits."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Lösche diesen Benutzer aus MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Löschen Sie diesen Benutzer von MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL Benutzer '%s'@'%%' existiert bereits"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Lösche diesen Benutzer aus MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Löschen Sie diesen Benutzer von MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -271,66 +272,72 @@ msgstr "Setze Administrator Benutzername."
 msgid "Set an admin password."
 msgstr "Setze Administrator Passwort"
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s hat »%s« mit Ihnen geteilt"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Die Kategorie \"%s\" konnte nicht gefunden werden."
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Vor %n Minute"
 msgstr[1] "Vor %n Minuten"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Vor %n Stunde"
 msgstr[1] "Vor %n Stunden"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "Heute"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "Gestern"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "Vor %n Tag"
 msgstr[1] "Vor %n Tagen"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Vor %n Monat"
 msgstr[1] "Vor %n Monaten"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "Vor  Jahren"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 42e8c8dc24..2af9442140 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -5,8 +5,10 @@
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
 # arkascha <foss@christian-reiner.info>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# I Robot, 2014
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
+# stefanniedermann <stefan.niedermann@googlemail.com>, 2014
+# traductor, 2013
 # noxin <transifex.com@davidmainzer.com>, 2013
 # Mirodin <blobbyjj@ymail.com>, 2013
 # kabum <uu.kabum@gmail.com>, 2013
@@ -14,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-05 22:23-0500\n"
-"PO-Revision-Date: 2013-12-05 13:20+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 11:50+0000\n"
 "Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +26,48 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Ungültiger Wert für %s übermittelt"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Gespeichert"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "E-Mail-Einstellungen testen"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email gesendet"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Sie müssen Ihre Benutzer-E-Mail-Adresse setzen, bevor Sie Test-E-Mails versenden können."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Sende-Modus"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Authentifizierungsmethode"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Die Liste der Anwendungen im Store konnte nicht geladen werden."
@@ -97,13 +141,13 @@ msgstr "Falsches Passwort"
 
 #: changepassword/controller.php:42
 msgid "No user supplied"
-msgstr "Keinen Benutzer übermittelt"
+msgstr "Keinen Benutzer angegeben"
 
 #: changepassword/controller.php:74
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können"
+msgstr "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzerdaten verloren gehen können"
 
 #: changepassword/controller.php:79
 msgid ""
@@ -120,62 +164,90 @@ msgstr "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzer
 msgid "Unable to change password"
 msgstr "Passwort konnte nicht geändert werden"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Sende..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Dokumentation für Benutzer"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Dokumentation für Administratoren"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Update zu {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Bitte warten...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Beim Aktivieren der Applikation ist ein Fehler aufgetreten"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Update..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Es ist ein Fehler während des Updates aufgetreten"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Update durchführen"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Wählen Sie ein Profilbild"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Sehr schwaches Passwort"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Schwaches Passwort"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Passables Passwort"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Gutes Passwort"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Starkes Passwort"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Speichern..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "gelöscht"
@@ -188,40 +260,40 @@ msgstr "rückgängig machen"
 msgid "Unable to remove user"
 msgstr "Der Benutzer konnte nicht entfernt werden."
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "Gruppe hinzufügen"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Es muss ein gültiger Benutzername angegeben werden"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Beim Erstellen des Benutzers ist ein Fehler aufgetreten"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Es muss ein gültiges Passwort angegeben werden"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Deutsch (Förmlich: Sie)"
 
@@ -243,20 +315,44 @@ msgstr "Fehler und fatale Probleme"
 
 #: templates/admin.php:12
 msgid "Fatal issues only"
-msgstr "Nur fatale Probleme"
+msgstr "Nur kritische Fehler"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Keine"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Anmelden"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Plain"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "NT LAN Manager"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sicherheitshinweis"
 
-#: templates/admin.php:25
+#: 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 "Sie greifen auf %s via HTTP zu. Wir empfehlen Ihnen dringend, Ihren Server so konfigurieren, das stattdessen HTTPS verlangt wird."
 
-#: templates/admin.php:39
+#: 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 "
@@ -265,188 +361,248 @@ msgid ""
 "root."
 msgstr "Ihr Datenverzeichnis und Ihre Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Einrichtungswarnung"
 
-#: templates/admin.php:53
+#: 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 "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr "Bitte überprüfen Sie die <a href=\"%s\">Instalationsanleitungen</a>."
+msgstr "Bitte prüfen Sie nochmals die <a href=\"%s\">Installationsanleitungen</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Das Modul 'fileinfo' fehlt"
 
-#: templates/admin.php:68
+#: 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 "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Ihre PHP-Version ist veraltet"
 
-#: templates/admin.php:82
+#: 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 "Ihre PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Die Lokalisierung funktioniert nicht"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann."
 
-#: templates/admin.php:106
+#: 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 "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Keine Internetverbindung"
 
-#: templates/admin.php:121
+#: 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 "
 "installation of 3rd party apps don´t work. Accessing files from remote and "
 "sending of notification emails might also not work. We suggest to enable "
 "internet connection for this server if you want to have all features."
-msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen."
+msgstr "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Letzter Cron wurde um %s ausgeführt."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron wurde bis jetzt noch nicht ausgeführt!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Eine Aufgabe bei jedem Laden der Seite ausführen"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Teilen"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Share-API aktivieren"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Anwendungen erlauben, die Share-API zu benutzen"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Öffentliches Hochladen erlauben"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
-msgstr "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen"
+msgstr "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Erlaube Weiterverteilen"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Erlaubt Benutzern, mit jedem zu teilen"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaubt Benutzern, nur mit Nutzern in ihrer Gruppe zu teilen"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Mail-Benachrichtigung erlauben"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sicherheit"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "HTTPS erzwingen"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden."
+msgstr "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "E-Mail-Server"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Dies wird für das Senden von Benachrichtigungen verwendet."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Absender-Adresse"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Authentifizierung benötigt"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Adresse des Servers"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Zugangsdaten"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "SMTP Benutzername"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "SMTP Passwort"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "E-Mail-Einstellungen testen"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "E-Mail senden"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log-Level"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mehr"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Weniger"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -456,30 +612,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Fügen Sie Ihre Anwendung hinzu"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Wählen Sie eine Anwendung aus"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Dokumentation:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Siehe Anwendungs-Website"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Dokumentation für Benutzer"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentation für Administratoren"
@@ -513,7 +673,7 @@ msgstr "Den Einrichtungsassistenten erneut anzeigen"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passwort"
 
@@ -525,151 +685,149 @@ msgstr "Ihr Passwort wurde geändert."
 msgid "Unable to change your password"
 msgstr "Das Passwort konnte nicht geändert werden"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-Mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Ihre E-Mail-Adresse"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren."
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Geben Sie eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilbild"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Neues hochladen"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
-msgstr "Neues aus den Dateien wählen"
+msgstr "Neues aus Dateien wählen"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Bild entfernen"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Ihr Avatar wird von Ihrerem ursprünglichenKonto verwendet."
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Abbrechen"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Als Profilbild wählen"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Sprache"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Helfen Sie bei der Übersetzung"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Verschlüsselung"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Login-Passwort"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Alle Dateien entschlüsseln"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Loginname"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Erstellen"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Admin-Passwort-Wiederherstellung"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Benutzername"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "Vollständigen Namen ändern"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "Neues Passwort setzen"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index ea78203877..721016886e 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -4,18 +4,18 @@
 # 
 # Translators:
 # a.tangemann <a.tangemann@web.de>, 2013
-# Marcel Kühlhorn <susefan93@gmx.de>, 2013
-# Mario Siegmann <mario_siegmann@web.de>, 2013
+# Marcel Kühlhorn <tux93@opensuse.org>, 2013
+# Mario Siegmann <mario_siegmann@web.de>, 2013-2014
 # JamFX <niko@nik-o-mat.de>, 2013
-# traductor <transifex-3.7.mensaje@spamgourmet.com>, 2013
+# traductor, 2013
 # noxin <transifex.com@davidmainzer.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,43 +92,43 @@ msgstr "Erfolg"
 msgid "Error"
 msgstr "Fehler"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Konfiguration OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Konfiguration nicht korrekt"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Konfiguration nicht vollständig"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Wähle Gruppen"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Objekt-Klassen auswählen"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Attribute auswählen"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Verbindungstest erfolgreich"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Verbindungstest fehlgeschlagen"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Möchten Sie die aktuelle Serverkonfiguration wirklich löschen?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Löschung bestätigen"
 
@@ -146,11 +146,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s Benutzer gefunden"
 msgstr[1] "%s Benutzer gefunden"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Ungültiger Host"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Konnte die gewünschte Funktion nicht finden"
 
@@ -168,8 +168,8 @@ msgstr "Hilfe"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Beschränke den Zugriff auf %s auf Gruppen, die die folgenden Kriterien erfüllen:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Gruppen-Versammlungen mit diesen Kriterien sind verfügbar in %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -204,8 +204,8 @@ msgid "groups found"
 msgstr "Gruppen gefunden"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Welches Attribut soll als Login-Name verwendet werden:"
+msgid "Users login with this attribute:"
+msgstr "Nutzeranmeldung mit diesem Merkmal:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -272,8 +272,8 @@ msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reit
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Beschränke den Zugriff auf %s auf Benutzer, die die folgenden Kriterien erfüllen:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -415,41 +415,51 @@ msgstr "Gruppensucheigenschaften"
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Eingebundene Gruppen"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)"
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Spezielle Eigenschaften"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kontingent-Feld"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Standard-Kontingent"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "E-Mail-Feld"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Benennungsregel für das Home-Verzeichnis des Benutzers"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Interner Benutzername"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -465,15 +475,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Standardmäßig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmäßig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Interne Eigenschaften des Benutzers:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "UUID-Erkennung überschreiben"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -484,19 +494,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Standardmäßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID-Attribute für Benutzer:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID-Attribute für Gruppen:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -510,10 +520,10 @@ msgid ""
 "experimental stage."
 msgstr "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Lösche LDAP-Benutzernamenzuordnung"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Lösche LDAP-Gruppennamenzuordnung"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index b453459ddc..54906380cd 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -3,12 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013-2014
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
-# vkehayas <vkehayas@gmail.com>, 2013
+# vkehayas <vkehayas@gmail.com>, 2013-2014
 # Wasilis <inactive+Wasilis@transifex.com>, 2013
 # Wasilis <inactive+Wasilis@transifex.com>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 20:50+0000\n"
-"Last-Translator: vkehayas <vkehayas@gmail.com>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,12 +26,11 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s"
@@ -48,19 +47,6 @@ msgstr "Η κατάσταση συντήρησης απενεργοποιήθη
 msgid "Updated database"
 msgstr "Ενημερωμένη βάση δεδομένων"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Ενημέρωση αποθηκευμένων αρχείων, αυτό μπορεί να πάρα πολύ ώρα..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Ενημέρωση αποθηκευμένων αρχείων"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% ολοκληρώθηκαν ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Δεν δόθηκε εικόνα ή αρχείο"
@@ -81,135 +67,139 @@ msgstr "Δεν υπάρχει προσωρινή φωτογραφία προφί
 msgid "No crop data provided"
 msgstr "Δεν δόθηκαν δεδομένα περικοπής"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Μάρτιος"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Απρίλιος"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Μάϊος"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Ιούνιος"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Ιούλιος"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Αύγουστος"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Δεκέμβριος"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:872
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Γίνεται αποθήκευση..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "δευτερόλεπτα πριν"
 
-#: js/js.js:873
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n λεπτό πριν"
 msgstr[1] "%n λεπτά πριν"
 
-#: js/js.js:874
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ώρα πριν"
 msgstr[1] "%n ώρες πριν"
 
-#: js/js.js:875
+#: js/js.js:998
 msgid "today"
 msgstr "σήμερα"
 
-#: js/js.js:876
+#: js/js.js:999
 msgid "yesterday"
 msgstr "χτες"
 
-#: js/js.js:877
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ημέρα πριν"
 msgstr[1] "%n ημέρες πριν"
 
-#: js/js.js:878
+#: js/js.js:1001
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: js/js.js:879
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n μήνας πριν"
 msgstr[1] "%n μήνες πριν"
 
-#: js/js.js:880
+#: js/js.js:1003
 msgid "months ago"
 msgstr "μήνες πριν"
 
-#: js/js.js:881
+#: js/js.js:1004
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: js/js.js:882
+#: js/js.js:1005
 msgid "years ago"
 msgstr "χρόνια πριν"
 
@@ -277,6 +267,26 @@ msgstr "({count} επιλέχθησαν)"
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Πολύ αδύναμο συνθηματικό"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Αδύναμο συνθηματικό"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Καλό συνθηματικό"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Δυνατό συνθηματικό"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Κοινόχρηστα"
@@ -285,12 +295,12 @@ msgstr "Κοινόχρηστα"
 msgid "Share"
 msgstr "Διαμοιρασμός"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Σφάλμα κατά τον διαμοιρασμό"
 
@@ -302,123 +312,123 @@ msgstr "Σφάλμα κατά το σταμάτημα του διαμοιρασ
 msgid "Error while changing permissions"
 msgstr "Σφάλμα κατά την αλλαγή των δικαιωμάτων"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Διαμοιράστηκε με σας από τον {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Διαμοιρασμός με χρήστη ή ομάδα ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Διαμοιρασμός συνδέσμου"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Προστασία συνθηματικού"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Να επιτρέπεται η Δημόσια Αποστολή"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Αποστολή συνδέσμου με email "
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Αποστολή"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Ορισμός ημ. λήξης"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Ημερομηνία λήξης"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Διαμοιρασμός μέσω email:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Δεν βρέθηκε άνθρωπος"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "ομάδα"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Ξαναμοιρασμός δεν επιτρέπεται"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Διαμοιρασμός του {item} με τον {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Σταμάτημα διαμοιρασμού"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "ειδοποίηση με email"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "δυνατότητα αλλαγής"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "έλεγχος πρόσβασης"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "δημιουργία"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "ενημέρωση"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "διαγραφή"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "διαμοιρασμός"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Προστασία με συνθηματικό"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Αποστολή..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Το Email απεστάλη "
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
@@ -465,11 +475,17 @@ msgstr "Η ενημέρωση ήταν ανεπιτυχής. Παρακαλώ σ
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s επαναφορά κωδικού πρόσβασης"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή email, παρακαλώ επικοινωνήστε με τον διαχειριστή."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}"
@@ -489,8 +505,8 @@ msgstr "Η αίτηση απέτυχε! Βεβαιωθηκατε ότι το ema
 msgid "You will receive a link to reset your password via Email."
 msgstr "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
@@ -526,6 +542,18 @@ msgstr "Νέο συνθηματικό"
 msgid "Reset password"
 msgstr "Επαναφορά συνθηματικού"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Προσωπικά"
@@ -534,7 +562,7 @@ msgstr "Προσωπικά"
 msgid "Users"
 msgstr "Χρήστες"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Εφαρμογές"
 
@@ -644,49 +672,47 @@ msgstr "Για πληροφορίες πως να ρυθμίσετε ορθά τ
 msgid "Create an <strong>admin account</strong>"
 msgstr "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Για προχωρημένους"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Φάκελος δεδομένων"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Ρύθμιση της βάσης δεδομένων"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "θα χρησιμοποιηθούν"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Χρήστης της βάσης δεδομένων"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Συνθηματικό βάσης δεδομένων"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Όνομα βάσης δεδομένων"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Κενά Πινάκων Βάσης Δεδομένων"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Διακομιστής βάσης δεδομένων"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Ολοκλήρωση..."
 
@@ -702,7 +728,7 @@ msgstr "Αυτή η εφαρμογή απαιτεί η JavaScript να είνα
 msgid "%s is available. Get more information on how to update."
 msgstr "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
@@ -728,28 +754,28 @@ msgstr "Η διαδικασία επικύρωσης απέτυχε από τη
 msgid "Please contact your administrator."
 msgstr "Παρακαλώ επικοινωνήστε με τον διαχειριστή."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Ξεχάσατε το συνθηματικό σας;"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "απομνημόνευση"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Είσοδος"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Εναλλακτικές Συνδέσεις"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το »%s« με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
@@ -777,7 +803,7 @@ msgstr "Ενημερώνοντας το ownCloud στην έκδοση %s,μπο
 #: templates/update.user.php:3
 msgid ""
 "This ownCloud instance is currently being updated, which may take a while."
-msgstr ""
+msgstr "Αυτή η εγκατάσταση ownCloud ενημερώνεται, το οποίο μπορεί να πάρει κάποιο χρόνο."
 
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 84a38b5c6e..fc989942bb 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013-2014
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 # gtsamis <gtsamis@yahoo.com>, 2013
 # frerisp <petrosfreris@gmail.com>, 2013
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 20:50+0000\n"
-"Last-Translator: vkehayas <vkehayas@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,283 +22,290 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Αδυναμία μετακίνησης του %s - υπάρχει ήδη αρχείο με αυτό το όνομα"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Αδυναμία μετακίνησης του %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Το όνομα αρχείου δεν μπορεί να είναι κενό."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Το όνομα αρχείου δεν μπορεί να περιέχει \"/\". Παρακαλώ επιλέξτε ένα διαφορετικό όνομα. "
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "Το \"%s\" είναι ένα μη έγκυρο όνομα αρχείου."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Το όνομα %s χρησιμοποιείτε ήδη στον φάκελο %s. Παρακαλώ επιλέξτε ένα άλλο όνομα."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Μη έγκυρη πηγή"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Ο διακομιστής δεν επιτρέπεται να ανοίγει URL, παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Σφάλμα κατά τη λήψη του %s στο %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Σφάλμα κατά τη δημιουργία του αρχείου"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Το όνομα φακέλου δεν μπορεί να είναι κενό."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Το όνομα φακέλου δεν μπορεί να περιέχει \"/\". Παρακαλώ επιλέξτε ένα διαφορετικό όνομα. "
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Σφάλμα δημιουργίας φακέλου"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Αδυναμία ορισμού καταλόγου αποστολής."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Μη έγκυρο Token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Το αρχείο που εστάλει υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Το αρχείο εστάλει μόνο εν μέρει"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Κανένα αρχείο δεν στάλθηκε"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Λείπει ο προσωρινός φάκελος"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Αποτυχία εγγραφής στο δίσκο"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Μη επαρκής διαθέσιμος αποθηκευτικός χώρος"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Η φόρτωση απέτυχε. Αδυναμία λήψης πληροφοριών αρχείων."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Η φόρτωση απέτυχε. Αδυναμία εύρεσης αρχείου προς φόρτωση."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Η φόρτωση απέτυχε. Αδυναμία λήψης πληροφοριών αρχείων."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Μη έγκυρος φάκελος."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Αρχεία"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Δεν υπάρχει αρκετός διαθέσιμος χώρος"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Η αποστολή ακυρώθηκε."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Αδυναμία λήψης αποτελέσματος από το διακομιστή."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "Η URL δεν πρέπει να είναι κενή"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Στον αρχικό φάκελο το όνομα 'Shared' διατηρείται από το σύστημα"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} υπάρχει ήδη"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Αδυναμία δημιουργίας αρχείου"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Αδυναμία δημιουργίας φακέλου"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Σφάλμα φόρτωσης URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Διαμοιρασμός"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Μόνιμη διαγραφή"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Εκκρεμεί"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Αδυναμία μετονομασίας αρχείου"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "αντικαταστάθηκε το {new_name} με {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Σφάλμα διαγραφής αρχείου."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n φάκελος"
 msgstr[1] "%n φάκελοι"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n αρχείο"
 msgstr[1] "%n αρχεία"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{Κατάλογοι αρχείων} και {αρχεία}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Ανέβασμα %n αρχείου"
 msgstr[1] "Ανέβασμα %n αρχείων"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' είναι μη έγκυρο όνομα αρχείου."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις"
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Η λήψη προετοιμάζεται. Αυτό μπορεί να πάρει ώρα εάν τα αρχεία έχουν μεγάλο μέγεθος."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Σφάλμα κατά τη μετακίνηση του αρχείου"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Όνομα"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
@@ -306,12 +313,12 @@ msgstr "Τροποποιήθηκε"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Άκυρο όνομα φακέλου. Η χρήση του 'Shared' διατηρείται από το σύστημα."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Αδυναμία μετονομασίας του %s"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Μεταφόρτωση"
 
@@ -347,72 +354,68 @@ msgstr "Μέγιστο μέγεθος για αρχεία ZIP"
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Νέο"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Νέο αρχείο κειμένου"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Αρχείο κειμένου"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Φάκελος"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Από σύνδεσμο"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Διαγραμμένα αρχεία"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Ακύρωση αποστολής"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Πολύ μεγάλο αρχείο προς αποστολή"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Τρέχουσα ανίχνευση"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Ενημέρωση της μνήμης cache του συστήματος αρχείων..."
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 18e02898e3..bd28873a5e 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-28 01:55-0500\n"
-"PO-Revision-Date: 2013-12-27 15:42+0000\n"
-"Last-Translator: vkehayas <vkehayas@gmail.com>\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"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -85,18 +85,18 @@ msgid ""
 "administrator"
 msgstr "Άγνωστο σφάλμα, παρακαλώ ελέγξτε τις ρυθμίσεις συστήματος ή επικοινωνήστε με τον διαχειριστή σας "
 
-#: hooks/hooks.php:62
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Προαπαιτούμενα που απουσιάζουν."
 
-#: hooks/hooks.php:63
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Παρακαλώ επιβεβαιώστε ότι η PHP 5.3.3  ή νεότερη είναι εγκατεστημένη  και ότι το  OpenSSL μαζί με το PHP extension είναι ενεργοποιήμένο και έχει ρυθμιστεί σωστά. Προς το παρόν, η εφαρμογή κρυπτογράφησης είναι απενεργοποιημένη."
 
-#: hooks/hooks.php:281
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:"
 
@@ -104,9 +104,9 @@ msgstr "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί γ
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπορεί να πάρει κάποια ώρα. Παρακαλώ περιμένετε."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Γίνεται αποθήκευση..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index d380c50daa..ca669ad43a 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: KAT.RAT12 <spanish.katerina@gmail.com>\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
+"PO-Revision-Date: 2014-03-13 14:21+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Προσβαση παρασχέθηκε"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox "
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Παροχή πρόσβασης"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive "
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Αποθηκεύτηκαν"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Προσοχή:</b> Ο \"smbclient\" δεν εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση CIFS/SMB. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Προσοχή:</b> Η υποστήριξη FTP στην PHP δεν ενεργοποιήθηκε ή εγκαταστάθηκε. Δεν είναι δυνατή η προσάρτηση FTP. Παρακαλώ ενημερώστε τον διαχειριστή συστήματος να το εγκαταστήσει."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Χρήστες"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Να επιτρέπεται στους χρήστες να προσαρτούν δικό τους εξωτερικό αποθηκευτικό χώρο"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Πιστοποιητικά SSL root"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Εισαγωγή Πιστοποιητικού Root"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 1c70dfb1d6..4d08fedac3 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/files_sharing.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2014
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 # vkehayas <vkehayas@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 21:00+0000\n"
-"Last-Translator: vkehayas <vkehayas@gmail.com>\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
+"PO-Revision-Date: 2014-03-13 15:47+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +20,10 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Διαμοιράστηκε από τον {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό"
@@ -55,32 +60,16 @@ msgstr "ο διαμοιρασμός απενεργοποιήθηκε"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "Ο %s μοιράστηκε τον φάκελο %s μαζί σας"
+msgid "shared by %s"
+msgstr "διαμοιράστηκε από %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "Ο %s μοιράστηκε το αρχείο %s μαζί σας"
+msgid "Download %s"
+msgstr "Λήψη %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Λήψη"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Μεταφόρτωση"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Ακύρωση μεταφόρτωσης"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Δεν υπάρχει διαθέσιμη προεπισκόπηση για"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Άμεσος σύνδεσμος"
diff --git a/l10n/el/files_trashbin.po b/l10n/el/files_trashbin.po
index 0d05dc752d..ac7af8db54 100644
--- a/l10n/el/files_trashbin.po
+++ b/l10n/el/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 21:15+0000\n"
-"Last-Translator: vkehayas <vkehayas@gmail.com>\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"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,21 +19,25 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Αδύνατη η μόνιμη διαγραφή του %s"
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Αδυναμία επαναφοράς %s"
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Διαγραμμένα αρχεία"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "επαναφέρθηκαν"
 
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index f59d5fe610..8f6d6e8c54 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2014
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
-# vkehayas <vkehayas@gmail.com>, 2013
+# vkehayas <vkehayas@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-27 01:55-0500\n"
-"PO-Revision-Date: 2013-12-26 13:10+0000\n"
-"Last-Translator: vkehayas <vkehayas@gmail.com>\n"
+"POT-Creation-Date: 2014-03-16 03:12-0400\n"
+"PO-Revision-Date: 2014-03-15 22:50+0000\n"
+"Last-Translator: Efstathios Iosifidis <iefstathios@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,34 +20,34 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:245
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Η εφαρμογή \"%s\" δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση του ownCloud."
 
-#: private/app.php:257
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Δεν προδιορίστηκε όνομα εφαρμογής"
 
-#: private/app.php:362
+#: private/app.php:353
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: private/app.php:375
+#: private/app.php:366
 msgid "Personal"
 msgstr "Προσωπικά"
 
-#: private/app.php:386
+#: private/app.php:377
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: private/app.php:398
+#: private/app.php:389
 msgid "Users"
 msgstr "Χρήστες"
 
-#: private/app.php:411
+#: private/app.php:402
 msgid "Admin"
 msgstr "Διαχειριστής"
 
@@ -63,15 +64,10 @@ msgstr "Άγνωστος τύπος αρχείου"
 msgid "Invalid image"
 msgstr "Μη έγκυρη εικόνα"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "υπηρεσίες δικτύου υπό τον έλεγχό σας"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "αδυναμία ανοίγματος \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Η λήψη ZIP απενεργοποιήθηκε."
@@ -94,74 +90,78 @@ msgid ""
 "administrator."
 msgstr "Παρακαλώ κάντε λήψη των αρχείων σε μικρότερα κομμάτια ή ζητήστε το από το διαχειριστή σας."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Δεν προσδιορίστηκε πηγή κατά την εγκατάσταση της εφαρμογής"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Δεν προσδιορίστηκε href κατά την εγκατάσταση της εφαρμογής μέσω http "
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Δεν προσδιορίστηκε μονοπάτι κατά την εγκατάσταση εφαρμογής από τοπικό αρχείο"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Συλλογές αρχείων τύπου %s δεν υποστηρίζονται"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Αποτυχία ανοίγματος συλλογής αρχείων κατά την εγκατάσταση εφαρμογής"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Η εφαρμογή δεν παρέχει αρχείο info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Η εφαρμογή δεν μπορεί να εγκατασταθεί λόγω μη-επιτρεπόμενου κώδικα μέσα στην Εφαρμογή"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή περιέχει την ετικέτα <shipped>σωστή</shipped> που δεν επιτρέπεται για μη-ενσωματωμένες εφαρμογές"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή η έκδοση στο info.xml/version δεν είναι η ίδια με την έκδοση που αναφέρεται στο κατάστημα εφαρμογών"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Ο κατάλογος εφαρμογών υπάρχει ήδη"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Δεν είναι δυνατόν να δημιουργηθεί ο φάκελος εφαρμογής. Παρακαλώ διορθώστε τις άδειες πρόσβασης. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Δεν ενεργοποιήθηκε η εφαρμογή"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Σφάλμα πιστοποίησης"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Άγνωστος χρήστης"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Αρχεία"
@@ -195,23 +195,23 @@ 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 "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "Μη έγκυρο όνομα χρήστη ή/και συνθηματικό της MySQL/MariaDB"
 
 #: 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 "Σφάλμα Βάσης Δεδομένων: \"%s\""
@@ -220,30 +220,30 @@ 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\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL/MariaDB"
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "Υπάρχει ήδη ο χρήστης '%s'@'%%' της MySQL/MariaDB"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Απόρριψη αυτού του χρήστη από την MySQL"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -258,7 +258,7 @@ msgstr "Μη έγκυρος χρήστης και/ή συνθηματικό τη
 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"
 
@@ -270,66 +270,72 @@ msgstr "Εισάγετε όνομα χρήστη διαχειριστή."
 msgid "Set an admin password."
 msgstr "Εισάγετε συνθηματικό διαχειριστή."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "Ο %s διαμοιράστηκε μαζί σας το »%s«"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Αδυναμία εύρεσης κατηγορίας \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "δευτερόλεπτα πριν"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n λεπτά πριν"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n ώρες πριν"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "σήμερα"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "χτες"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n ημέρες πριν"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "τελευταίο μήνα"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n μήνες πριν"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "τελευταίο χρόνο"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "χρόνια πριν"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 84b51f5709..963340f3af 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -3,20 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Efstathios Iosifidis <iefstathios@gmail.com>, 2013
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013-2014
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # Teogramm <theodorewii121@hotmail.com>, 2013
 # vkehayas <vkehayas@gmail.com>, 2013
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
+# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 20:50+0000\n"
-"Last-Translator: vkehayas <vkehayas@gmail.com>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,6 +25,48 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Αποθηκεύτηκαν"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "δοκιμή ρυθμίσεων email"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail. Παρακαλώ ελέγξτε τις ρυθμίσεις σας."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Το Email απεστάλη "
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Κατάσταση αποστολής"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Κρυπτογράφηση"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Μέθοδος πιστοποίησης"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Σφάλμα στην φόρτωση της λίστας από το App Store"
@@ -120,62 +163,90 @@ msgstr "Το βασικό πλαίσιο δεν υποστηρίζει αλλα
 msgid "Unable to change password"
 msgstr "Αδυναμία αλλαγής συνθηματικού"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Αποστέλεται..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Τεκμηρίωση Χρήστη"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Τεκμηρίωση Διαχειριστή"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Ενημέρωση σε {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Παρακαλώ περιμένετε..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Σφάλμα κατά την απενεργοποίηση εισόδου"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Σφάλμα κατά την ενεργοποίηση της εφαρμογής"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Ενημέρωση..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Σφάλμα κατά την ενημέρωση της εφαρμογής"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Ενημερώθηκε"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Επιλογή εικόνας προφίλ"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Πολύ αδύναμο συνθηματικό"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Αδύναμο συνθηματικό"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Καλό συνθηματικό"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Δυνατό συνθηματικό"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Γίνεται αποθήκευση..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "διαγράφηκε"
@@ -188,40 +259,40 @@ msgstr "αναίρεση"
 msgid "Unable to remove user"
 msgstr "Αδυναμία αφαίρεση χρήστη"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Ομάδα Διαχειριστών"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "προσθήκη ομάδας"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Πρέπει να δοθεί έγκυρο όνομα χρήστη"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Σφάλμα δημιουργίας χρήστη"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Πρέπει να δοθεί έγκυρο συνθηματικό"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Προειδοποίηση: Ο μητρικός κατάλογος του χρήστη \"{user}\" υπάρχει ήδη"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__όνομα_γλώσσας__"
 
@@ -245,18 +316,42 @@ msgstr "Σφάλματα και καίρια ζητήματα"
 msgid "Fatal issues only"
 msgstr "Καίρια ζητήματα μόνο"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Τίποτα"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Σύνδεση"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "Διαχειριστης NT LAN"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Προειδοποίηση Ασφαλείας"
 
-#: templates/admin.php:25
+#: 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:39
+#: 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 "
@@ -265,68 +360,68 @@ msgid ""
 "root."
 msgstr "Ο κατάλογος δεδομένων και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων έξω από τη ρίζα του καταλόγου του διακομιστή."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Ρύθμιση Προειδοποίησης"
 
-#: templates/admin.php:53
+#: 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:54
+#: 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:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Η ενοτητα 'fileinfo' λειπει"
 
-#: templates/admin.php:68
+#: 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 "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. "
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Η έκδοση PHP είναι απαρχαιωμένη"
 
-#: templates/admin.php:82
+#: 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:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Η μετάφραση δεν δουλεύει"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Οι ρυθμίσεις τοποθεσίας συστήματος δεν μπορούν να οριστούν σε κάποιες που δεν υποστηρίζουν UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Αυτό σημαίνει ότι μπορεί να υπάρχουν προβλήματα με κάποιους χαρακτήρες στα ονόματα αρχείων."
 
-#: templates/admin.php:106
+#: 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:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Η σύνδεση στο διαδίκτυο δεν δουλεύει"
 
-#: templates/admin.php:121
+#: 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 "
@@ -335,118 +430,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις περί ενημερώσεων ή η εγκατάσταση 3ων εφαρμογών δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Εκτέλεση μιας διεργασίας με κάθε σελίδα που φορτώνεται"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 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 λεπτά μέσω http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Χρήση της υπηρεσίας cron του συστήματος για να καλεστεί το αρχείο cron.php κάθε 15 λεπτά."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Διαμοιρασμός"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Ενεργοποίηση API Διαμοιρασμού"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν το API Διαμοιρασμού"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Να επιτρέπονται σύνδεσμοι"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν δημόσια με συνδέσμους"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Επιτρέψτε κοινόχρηστο ανέβασμα"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Επιτρέψτε στους χρήστες να καθιστούν άλλους χρήστες ικανούς να ανεβάζουν στους κοινόχρηστους φακέλους τους"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Να επιτρέπεται ο επαναδιαμοιρασμός"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Να επιτρέπεται στους χρήστες να διαμοιράζουν ότι τους έχει διαμοιραστεί"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Να επιτρέπεται ο διαμοιρασμός με οποιονδήποτε"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Να επιτρέπεται στους χρήστες ο διαμοιρασμός μόνο με χρήστες της ίδιας ομάδας"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Επιτρέψτε ειδοποιήσεις ηλεκτρονικού ταχυδρομείου"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Επιτρέψτε στο χρήστη να στέλνει ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Ασφάλεια"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Επιβολή χρήσης HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Επιβάλλει τους δέκτες να συνδέονται με το %s μέσω κρυπογραφημένης σύνδεσης."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Διακομιστής Email"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Χρησιμοποιείται για αποστολή ειδοποιήσεων."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Από τη διεύθυνση"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Απαιτείται πιστοποίηση"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Διεύθυνση διακομιστή"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Θύρα"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Πιστοποιητικά"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "Όνομα χρήστη SMTP"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "Συνθηματικό SMTP"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Δοκιμή ρυθμίσεων email"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Αποστολή email"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Καταγραφές"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Επίπεδο καταγραφής"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Περισσότερα"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Λιγότερα"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Έκδοση"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -454,31 +609,35 @@ msgid ""
 "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
 "target=\"_blank\"><abbr title=\"Affero General Public "
 "License\">AGPL</abbr></a>."
-msgstr "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
+msgstr "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>. Ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
-msgstr "Πρόσθεστε τη Δικιά σας Εφαρμογή"
+msgstr "Προσθέστε Δικιά σας Εφαρμογή"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Περισσότερες Εφαρμογές"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Επιλέξτε μια Εφαρμογή"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Τεκμηρίωση:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com"
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>-άδεια από <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Δείτε την ιστοσελίδα της εφαρμογής"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Τεκμηρίωση Χρήστη"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr "Άδεια χρήσης <span class=\"licence\"></span> από <span class=\"author\"></span>"
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
@@ -506,14 +665,14 @@ msgstr "Λήψη της εφαρμογής για συγχρονισμό των
 
 #: templates/personal.php:19
 msgid "Show First Run Wizard again"
-msgstr "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι"
+msgstr "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά"
 
 #: templates/personal.php:27
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>"
+msgstr "Χρησιμοποιήσατε <strong>%s</strong> από τα <strong>%s</strong> διαθέσιμα"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Συνθηματικό"
 
@@ -525,151 +684,149 @@ msgstr "Το συνθηματικό σας έχει αλλάξει"
 msgid "Unable to change your password"
 msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Τρέχων συνθηματικό"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Νέο συνθηματικό"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Αλλαγή συνθηματικού"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Πλήρες όνομα"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
-msgstr "Ηλ. ταχυδρομείο"
+msgstr "Ηλεκτρονικό ταχυδρομείο"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
-msgstr "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας"
-
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού"
+msgstr "Η διεύθυνση ηλ. ταχυδρομείου σας"
 
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Συμπληρώστε μια διεύθυνση email για να ενεργοποιήσετε την επαναφορά συνθηματικού και να λαμβάνετε ειδοποιήσεις"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Φωτογραφία προφίλ"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Μεταφόρτωση νέου"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Επιλογή νέου από τα Αρχεία"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Αφαίρεση εικόνας"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Είτε png ή jpg. Ιδανικά τετράγωνη αλλά θα είστε σε θέση να την περικόψετε."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Ματαίωση"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Άκυρο"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Επιλογή εικόνας προφίλ"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Βοηθήστε στη μετάφραση"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
-msgstr "Χρήση αυτής της διεύθυνσης <a href=\"%s\" target=\"_blank\">πρόσβαση των Αρχείων σας μέσω WebDAV</a>"
+msgstr "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">πρόσβαση στα αρχεία σας μέσω WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Κρυπτογράφηση"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Συνθηματικό εισόδου"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Αποκρυπτογράφηση όλων των Αρχείων"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Όνομα Σύνδεσης"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Δημιουργία"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Κωδικός Επαναφοράς Διαχειριστή "
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Προκαθορισμένη Αποθήκευση "
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\"  ή \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Απεριόριστο"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Άλλο"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Αποθήκευση"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "αλλαγή πλήρους ονόματος"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "επιλογή νέου κωδικού"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Προκαθορισμένο"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 636f833c27..f9c9174c55 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Marios Bekatoros <>, 2013
-# vkehayas <vkehayas@gmail.com>, 2013
+# vkehayas <vkehayas@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 20:50+0000\n"
-"Last-Translator: vkehayas <vkehayas@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,7 +58,7 @@ msgstr "Δεν προσδιορίστηκαν δεδομένα"
 #: ajax/wizard.php:89
 #, php-format
 msgid " Could not set configuration %s"
-msgstr ""
+msgstr "Αδυναμία ρύθμισης %s"
 
 #: js/settings.js:67
 msgid "Deletion failed"
@@ -88,43 +88,43 @@ msgstr "Επιτυχία"
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Η διαμόρφωση είναι εντάξει"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Η διαμόρφωση είναι λανθασμένη"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Η διαμόρφωση είναι ελλιπής"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Επιλέξτε ομάδες"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Επιλογή κλάσης αντικειμένων"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Επιλογή χαρακτηριστικών"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Επιτυχημένη δοκιμαστική σύνδεση"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Αποτυχημένη δοκιμαστική σύνδεσης."
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Επιβεβαίωση Διαγραφής"
 
@@ -142,11 +142,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s χρήστης βρέθηκε"
 msgstr[1] "%s χρήστες βρέθηκαν"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Άκυρος εξυπηρετητής"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Αδυναμία εύρεσης επιθυμητου χαρακτηριστικού"
 
@@ -164,8 +164,8 @@ msgstr "Βοήθεια"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Περιορισμός πρόσβασης %s σε ομάδες που ταιριάζουν αυτά τα κριτήρια:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -200,8 +200,8 @@ msgid "groups found"
 msgstr "ομάδες βρέθηκαν"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Ποια ιδιότητα θα χρησιμοποιηθεί ως όνομα σύνδεσης:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -268,8 +268,8 @@ msgstr "Μπορείτε να καθορίσετε το Base DN για χρήσ
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Περιορισμός πρόσβασης %s σε χρήστες που ταιριάζουν αυτά τα κριτήρια:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -334,7 +334,7 @@ msgstr "Απενεργοποιηση του κεντρικου διακομισ
 
 #: templates/settings.php:25
 msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Σύνδεση μόνο με το διακομιστή-αντίγραφο."
 
 #: templates/settings.php:26
 msgid "Case insensitve LDAP server (Windows)"
@@ -411,41 +411,51 @@ msgstr "Ομάδα Χαρακτηριστικων Αναζήτηση"
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Ειδικά Χαρακτηριστικά "
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Ποσοσταση πεδιου"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Προκαθισμενο πεδιο"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "σε bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Email τυπος"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας "
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Εσωτερικό Όνομα Χρήστη"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Εξ ορισμού, το εσωτερικό όνομα χρήστη θα δημιουργηθεί από το χαρακτηριστικό UUID. Αυτό βεβαιώνει ότι το όνομα χρήστη είναι μοναδικό και δεν χρειάζεται μετατροπή χαρακτήρων. Το εσωτερικό όνομα χρήστη έχει τον περιορισμό ότι μόνο αυτοί οι χαρακτήρες επιτρέπονται: [ a-zA-Z0-9_.@- ]. Οι άλλοι χαρακτήρες αντικαθίστανται με τους αντίστοιχους ASCII ή απλά παραλείπονται. Στις συγκρούσεις ένας αριθμός θα προστεθεί / αυξηθεί. Το εσωτερικό όνομα χρήστη χρησιμοποιείται για την αναγνώριση ενός χρήστη εσωτερικά. Είναι επίσης το προεπιλεγμένο όνομα για τον αρχικό φάκελο χρήστη. Αποτελεί επίσης μέρος των απομακρυσμένων διευθύνσεων URL, για παράδειγμα για όλες τις υπηρεσίες *DAV. Με αυτή τη ρύθμιση, η προεπιλεγμένη συμπεριφορά μπορεί να παρακαμφθεί. Για να επιτευχθεί μια παρόμοια συμπεριφορά όπως πριν το ownCloud 5 εισάγετε το χαρακτηριστικό του προβαλλόμενου ονόματος χρήστη στο παρακάτω πεδίο. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε νεώτερους (προστιθέμενους) χρήστες LDAP."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Ιδιότητα Εσωτερικού Ονόματος Χρήστη:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Παράκαμψη ανίχνευσης UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Από προεπιλογή, το χαρακτηριστικό UUID εντοπίζεται αυτόματα. Το χαρακτηριστικό UUID χρησιμοποιείται για την αναγνώριση χωρίς αμφιβολία χρηστών και ομάδων LDAP. Επίσης, το εσωτερικό όνομα χρήστη θα δημιουργηθεί με βάση το UUID, εφόσον δεν ορίζεται διαφορετικά ανωτέρω. Μπορείτε να παρακάμψετε τη ρύθμιση και να ορίσετε ένα χαρακτηριστικό της επιλογής σας. Θα πρέπει να βεβαιωθείτε ότι το χαρακτηριστικό της επιλογής σας μπορεί να ληφθεί για τους χρήστες και τις ομάδες και ότι είναι μοναδικό. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε πρόσφατα αντιστοιχισμένους (προστιθέμενους) χρήστες και ομάδες LDAP."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Χαρακτηριστικό UUID για Χρήστες:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Χαρακτηριστικό UUID για Ομάδες:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Αντιστοίχιση Χρηστών Όνομα Χρήστη-LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr "Τα ονόματα χρηστών χρησιμοποιούνται για την αποθήκευση και την ανάθεση (μετα) δεδομένων. Προκειμένου να προσδιοριστούν με ακρίβεια και να αναγνωρίστουν οι χρήστες, κάθε χρήστης LDAP θα έχει ένα εσωτερικό όνομα. Αυτό απαιτεί μια αντιστοίχιση του ονόματος χρήστη με το χρήστη LDAP. Το όνομα χρήστη που δημιουργήθηκε αντιστοιχίζεται στην UUID του χρήστη LDAP. Επιπροσθέτως, το DN αποθηκεύεται προσωρινά (cache) ώστε να μειωθεί η αλληλεπίδραση LDAP, αλλά δεν χρησιμοποιείται για την ταυτοποίηση. Αν το DN αλλάξει, οι αλλαγές θα βρεθούν. Το εσωτερικό όνομα χρήστη χρησιμοποιείται παντού. Η εκκαθάριση των αντιστοιχίσεων θα αφήσει κατάλοιπα παντού. Η εκκαθάριση των αντιστοιχίσεων δεν επηρεάζεται από τη διαμόρφωση, επηρεάζει όλες τις διαμορφώσεις LDAP! Μην διαγράψετε ποτέ τις αντιστοιχίσεις σε ένα λειτουργικό περιβάλλον παρά μόνο σε δοκιμές ή σε πειραματικό στάδιο."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Διαγραφή αντιστοίχησης Ονόματος Χρήστη LDAP-Χρήστη"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Διαγραφή αντιστοίχησης Ονόματος Ομάδας-LDAP Ομάδας"
diff --git a/l10n/en@pirate/core.po b/l10n/en@pirate/core.po
index c0c1a7e88f..90ddc87e52 100644
--- a/l10n/en@pirate/core.po
+++ b/l10n/en@pirate/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -73,135 +59,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -269,6 +259,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -277,12 +287,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -294,123 +304,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Passcode"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -457,11 +467,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -481,8 +497,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -518,6 +534,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -526,7 +554,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -636,49 +664,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -694,7 +720,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -720,27 +746,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/en@pirate/files.po b/l10n/en@pirate/files.po
index 531771612f..bb4ddcd0bf 100644
--- a/l10n/en@pirate/files.po
+++ b/l10n/en@pirate/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/en@pirate/files_encryption.po b/l10n/en@pirate/files_encryption.po
index c181add627..1716bac96c 100644
--- a/l10n/en@pirate/files_encryption.po
+++ b/l10n/en@pirate/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/en@pirate/files_external.po b/l10n/en@pirate/files_external.po
index a7724b86be..0b58c4de7a 100644
--- a/l10n/en@pirate/files_external.po
+++ b/l10n/en@pirate/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"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"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/en@pirate/files_sharing.po b/l10n/en@pirate/files_sharing.po
index eac6fd04d8..5209e66833 100644
--- a/l10n/en@pirate/files_sharing.po
+++ b/l10n/en@pirate/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -54,32 +58,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s shared the folder %s with you"
-
-#: templates/public.php:21
-#, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s shared the file %s with you"
-
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Download"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:59
-msgid "Cancel upload"
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "No preview available for"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/en@pirate/files_trashbin.po b/l10n/en@pirate/files_trashbin.po
index 416897b2d2..09c83d1aa9 100644
--- a/l10n/en@pirate/files_trashbin.po
+++ b/l10n/en@pirate/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/en@pirate/lib.po b/l10n/en@pirate/lib.po
index 5d487df142..de836bfdfb 100644
--- a/l10n/en@pirate/lib.po
+++ b/l10n/en@pirate/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/en@pirate/settings.po b/l10n/en@pirate/settings.po
index ec63820b82..5860fa8a93 100644
--- a/l10n/en@pirate/settings.po
+++ b/l10n/en@pirate/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passcode"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/en@pirate/user_ldap.po b/l10n/en@pirate/user_ldap.po
index 8749947a12..e236d0b96d 100644
--- a/l10n/en@pirate/user_ldap.po
+++ b/l10n/en@pirate/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/en_GB/core.po b/l10n/en_GB/core.po
index 5dc93a2d23..b6c1fd256b 100644
--- a/l10n/en_GB/core.po
+++ b/l10n/en_GB/core.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mnestis <transifex@mnestis.net>, 2013
+# mnestis <transifex@mnestis.net>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-24 01:55-0400\n"
+"PO-Revision-Date: 2014-03-23 15:01+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"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s shared \"%s\" with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "Expiration date is in the past."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Couldn't send mail to following users: %s "
@@ -40,19 +39,6 @@ msgstr "Turned off maintenance mode"
 msgid "Updated database"
 msgstr "Updated database"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Updating filecache, this may take a really long time..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Updated filecache"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% done ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No image or file provided"
@@ -73,135 +59,139 @@ msgstr "No temporary profile picture available, try again"
 msgid "No crop data provided"
 msgstr "No crop data provided"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Sunday"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Monday"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Tuesday"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Wednesday"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Thursday"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Friday"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Saturday"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "January"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "February"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "March"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "May"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "June"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "July"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "October"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "December"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Settings"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Saving..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "seconds ago"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute ago"
 msgstr[1] "%n minutes ago"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hour ago"
 msgstr[1] "%n hours ago"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "today"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "yesterday"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n day ago"
 msgstr[1] "%n days ago"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "last month"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n month ago"
 msgstr[1] "%n months ago"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "months ago"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "last year"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "years ago"
 
@@ -269,6 +259,26 @@ msgstr "({count} selected)"
 msgid "Error loading file exists template"
 msgstr "Error loading file exists template"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Very weak password"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Weak password"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "So-so password"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Good password"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Strong password"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Shared"
@@ -277,12 +287,12 @@ msgstr "Shared"
 msgid "Share"
 msgstr "Share"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error whilst sharing"
 
@@ -294,123 +304,123 @@ msgstr "Error whilst unsharing"
 msgid "Error while changing permissions"
 msgstr "Error whilst changing permissions"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Shared with you and the group {group} by {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Shared with you by {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Share with user or group …"
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Share link"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Password protect"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Allow Public Upload"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Email link to person"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Set expiration date"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Expiration date"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Share via email:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "No people found"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "group"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Resharing is not allowed"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Shared in {item} with {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Unshare"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "notify by email"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "can edit"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "access control"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "create"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "update"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "delete"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "share"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Password protected"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Error unsetting expiration date"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sending ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email sent"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Warning"
 
@@ -457,11 +467,17 @@ msgstr "The update was unsuccessful. Please report this issue to the <a href=\"h
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "The update was successful. Redirecting you to ownCloud now."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s password reset"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "A problem has occurred whilst sending the email, please contact your administrator."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Use the following link to reset your password: {link}"
@@ -481,8 +497,8 @@ msgstr "Request failed!<br>Did you make sure your email/username was correct?"
 msgid "You will receive a link to reset your password via Email."
 msgstr "You will receive a link to reset your password via email."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Username"
 
@@ -518,6 +534,18 @@ msgstr "New password"
 msgid "Reset password"
 msgstr "Reset password"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! "
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "For the best results, please consider using a GNU/Linux server instead."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -526,7 +554,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Users"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -636,49 +664,47 @@ msgstr "For information how to properly configure your server, please see the <a
 msgid "Create an <strong>admin account</strong>"
 msgstr "Create an <strong>admin account</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Storage & database"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Data folder"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configure the database"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "will be used"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Database user"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Database password"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Database name"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Finish setup"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Finishing …"
 
@@ -694,7 +720,7 @@ msgstr "This application requires JavaScript to be enabled for correct operation
 msgid "%s is available. Get more information on how to update."
 msgstr "%s is available. Get more information on how to update."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Log out"
 
@@ -720,28 +746,28 @@ msgstr "Server side authentication failed!"
 msgid "Please contact your administrator."
 msgstr "Please contact your administrator."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Lost your password?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "remember"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Log in"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternative Logins"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/en_GB/files.po b/l10n/en_GB/files.po
index 259e932c17..182341b8a2 100644
--- a/l10n/en_GB/files.po
+++ b/l10n/en_GB/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mnestis <transifex@mnestis.net>, 2013
+# mnestis <transifex@mnestis.net>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 14:50+0000\n"
-"Last-Translator: mnestis <transifex@mnestis.net>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\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"
@@ -18,283 +18,290 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Could not move %s - File with this name already exists"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Could not move %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "File name cannot be empty."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" is an invalid file name."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "The target folder has been moved or deleted."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "The name %s is already used in the folder %s. Please choose a different name."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Not a valid source"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Server is not allowed to open URLs, please check the server configuration"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Error whilst downloading %s to %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Error when creating the file"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Folder name cannot be empty."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Folder name must not contain \"/\". Please choose a different name."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Error when creating the folder"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Unable to set upload directory."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Invalid Token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "No file was uploaded. Unknown error"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "There is no error, the file uploaded successfully"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "The uploaded file was only partially uploaded"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "No file was uploaded"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Missing a temporary folder"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Failed to write to disk"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Not enough storage available"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Upload failed. Could not get file info."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload failed. Could not find uploaded file"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Upload failed. Could not get file info."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Invalid directory."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Files"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Unable to upload {filename} as it is a directory or has 0 bytes"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Total file size {size1} exceeds upload limit {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Not enough free space, you are uploading {size1} but only {size2} is left"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload cancelled."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Could not get result from server."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File upload is in progress. Leaving the page now will cancel the upload."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL cannot be empty"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "In the home folder 'Shared' is a reserved file name"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} already exists"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Could not create file"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Could not create folder"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Error fetching URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Share"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Delete permanently"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Rename"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Pending"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Could not rename file"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "replaced {new_name} with {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "undo"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Error deleting file."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 msgstr[1] "%n folders"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n files"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} and {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Uploading %n file"
 msgstr[1] "Uploading %n files"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" is an invalid file name."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Your storage is full, files can not be updated or synced anymore!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Encryption App is enabled but your keys are not initialised, please log-out and log-in again"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Error moving file"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Size"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modified"
 
@@ -302,12 +309,12 @@ msgstr "Modified"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Invalid folder name. Usage of 'Shared' is reserved."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s could not be renamed"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Upload"
 
@@ -343,72 +350,68 @@ msgstr "Maximum input size for ZIP files"
 msgid "Save"
 msgstr "Save"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "New"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "New text file"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Text file"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "New folder"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "From link"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Deleted files"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancel upload"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "You don’t have permission to upload or create files here"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Nothing in here. Upload something!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Upload too large"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "The files you are trying to upload exceed the maximum size for file uploads on this server."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Files are being scanned, please wait."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Current scanning"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Upgrading filesystem cache..."
diff --git a/l10n/en_GB/files_encryption.po b/l10n/en_GB/files_encryption.po
index a9281d9215..11aed8c642 100644
--- a/l10n/en_GB/files_encryption.po
+++ b/l10n/en_GB/files_encryption.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mnestis <transifex@mnestis.net>, 2013
+# mnestis <transifex@mnestis.net>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-11-29 19:30+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 12:10+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"
@@ -81,18 +81,18 @@ msgid ""
 "administrator"
 msgstr "Unknown error. Please check your system settings or contact your administrator"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Missing requirements."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "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."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Following users are not set up for encryption:"
 
@@ -100,9 +100,9 @@ msgstr "Following users are not set up for encryption:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Initial encryption started... This can take some time. Please wait."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Initial encryption running... Please try again later."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/en_GB/files_external.po b/l10n/en_GB/files_external.po
index bbfe3b3d26..c0315649af 100644
--- a/l10n/en_GB/files_external.po
+++ b/l10n/en_GB/files_external.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mnestis <transifex@mnestis.net>, 2013
+# mnestis <transifex@mnestis.net>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 12:10+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"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Access granted"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Error configuring Dropbox storage"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Grant access"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Please provide a valid Dropbox app key and secret."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Error configuring Google Drive storage"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Saved"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>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."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Users"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Enable User External Storage"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
+msgstr "Allow users to mount the following external storage"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL root certificates"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Import Root Certificate"
diff --git a/l10n/en_GB/files_sharing.po b/l10n/en_GB/files_sharing.po
index ba0d1d9fcc..1874dfa459 100644
--- a/l10n/en_GB/files_sharing.po
+++ b/l10n/en_GB/files_sharing.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mnestis <transifex@mnestis.net>, 2013
+# mnestis <transifex@mnestis.net>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:00+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"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Shared by {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "This share is password-protected"
@@ -54,32 +58,16 @@ msgstr "sharing is disabled"
 msgid "For more info, please ask the person who sent this link."
 msgstr "For more info, please ask the person who sent this link."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s shared the folder %s with you"
+msgid "shared by %s"
+msgstr "shared by %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s shared the file %s with you"
+msgid "Download %s"
+msgstr "Download %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Download"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Upload"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Cancel upload"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "No preview available for"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Direct link"
diff --git a/l10n/en_GB/files_trashbin.po b/l10n/en_GB/files_trashbin.po
index 6da8b00bfe..03c81a6e1a 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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Couldn't delete %s permanently"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Couldn't restore %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Deleted files"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Error"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "restored"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nothing in here. Your recycle bin is empty!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Name"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Restore"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Deleted"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Delete"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Deleted Files"
diff --git a/l10n/en_GB/lib.po b/l10n/en_GB/lib.po
index 94418cfa7d..9eb29ced3e 100644
--- a/l10n/en_GB/lib.po
+++ b/l10n/en_GB/lib.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mnestis <transifex@mnestis.net>, 2013
+# mnestis <transifex@mnestis.net>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "App \"%s\" can't be installed because it is not compatible with this version of ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "No app name specified"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Help"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Settings"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Users"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Failed to upgrade \"%s\"."
@@ -62,15 +62,10 @@ msgstr "Unknown filetype"
 msgid "Invalid image"
 msgstr "Invalid image"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "cannot open \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP download is turned off."
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr "Please download the files separately in smaller chunks or kindly ask your administrator."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "No source specified when installing app"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "No href specified when installing app from http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "No path specified when installing app from local file"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Archives of type %s are not supported"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Failed to open archive when installing app"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "App does not provide an info.xml file"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "App can't be installed because of unallowed code in the App"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "App can't be installed because it is not compatible with this version of ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "App directory already exists"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Can't create app folder. Please fix permissions. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Application is not enabled"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Authentication error"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token expired. Please reload page."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Unknown user"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Files"
@@ -194,23 +193,23 @@ 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."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "MySQL/MariaDB username and/or password not valid"
 
 #: 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 "DB Error: \"%s\""
@@ -219,30 +218,30 @@ 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\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "MySQL/MariaDB user '%s'@'localhost' exists already."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Drop this user from MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "MySQL/MariaDB user '%s'@'%%' already exists"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Drop this user from MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -257,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"
 
@@ -269,66 +268,72 @@ msgstr "Set an admin username."
 msgid "Set an admin password."
 msgstr "Set an admin password."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Please double check the <a href='%s'>installation guides</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s shared \"%s\" with you"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Could not find category \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "seconds ago"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute ago"
 msgstr[1] "%n minutes ago"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hour ago"
 msgstr[1] "%n hours ago"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "today"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "yesterday"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n day go"
 msgstr[1] "%n days ago"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "last month"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n month ago"
 msgstr[1] "%n months ago"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "last year"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "years ago"
diff --git a/l10n/en_GB/settings.po b/l10n/en_GB/settings.po
index d3903fba58..f04a916b0c 100644
--- a/l10n/en_GB/settings.po
+++ b/l10n/en_GB/settings.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mnestis <transifex@mnestis.net>, 2013
+# mnestis <transifex@mnestis.net>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-05 22:23-0500\n"
-"PO-Revision-Date: 2013-12-05 14:30+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 12:20+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"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Invalid value supplied for %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Saved"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "test email settings"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "If you received this email, the settings seem to be correct."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "A problem occurred whilst sending the e-mail. Please revisit your settings."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email sent"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "You need to set your user email before being able to send test emails."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Send mode"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Encryption"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Authentication method"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Unable to load list from App Store"
@@ -114,62 +156,90 @@ msgstr "Back-end doesn't support password change, but the user's encryption key
 msgid "Unable to change password"
 msgstr "Unable to change password"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Sending..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "User Documentation"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Admin Documentation"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Update to {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Disable"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Enable"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Please wait...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Error whilst disabling app"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Error whilst enabling app"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Updating...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Error whilst updating app"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Update"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Updated"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Select a profile picture"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Very weak password"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Weak password"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "So-so password"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Good password"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Strong password"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decrypting files... Please wait, this can take some time."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Saving..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "deleted"
@@ -182,40 +252,40 @@ msgstr "undo"
 msgid "Unable to remove user"
 msgstr "Unable to remove user"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Groups"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Group Admin"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Delete"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "add group"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "A valid username must be provided"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Error creating user"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "A valid password must be provided"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Warning: Home directory for user \"{user}\" already exists"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -239,18 +309,42 @@ msgstr "Errors and fatal issues"
 msgid "Fatal issues only"
 msgstr "Fatal issues only"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "None"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Login"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Plain"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "NT LAN Manager"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Security Warning"
 
-#: templates/admin.php:25
+#: 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 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead."
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr "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."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Setup Warning"
 
-#: templates/admin.php:53
+#: 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 "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Please double check the <a href=\"%s\">installation guides</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' missing"
 
-#: templates/admin.php:68
+#: 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 "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Your PHP version is outdated"
 
-#: templates/admin.php:82
+#: 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 "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."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Locale not working"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "System locale can not be set to a one which supports UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "This means that there might be problems with certain characters in file names."
 
-#: templates/admin.php:106
+#: 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 "We strongly suggest installing the required packages on your system to support one of the following locales: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Internet connection not working"
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don't work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Last cron was executed at %s."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "Last cron was executed at %s. This is more than an hour ago, something seems wrong."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron was not executed yet!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Execute one task with each page loaded"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php is registered at a webcron service to call cron.php every 15 minutes over http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Use system's cron service to call the cron.php file every 15 minutes."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Sharing"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Enable Share API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Allow apps to use the Share API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Allow links"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Allow users to share items to the public with links"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Allow public uploads"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Allow users to enable others to upload into their publicly shared folders"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Allow resharing"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Allow users to share items shared with them again"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Allow users to share with anyone"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Allow users to only share with users in their groups"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Allow mail notification"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Allow user to send mail notification for shared files"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Security"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Enforce HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forces the clients to connect to %s via an encrypted connection."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Email Server"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "This is used for sending out notifications."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "From address"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Authentication required"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Server address"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Credentials"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "SMTP Username"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "SMTP Password"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Test email settings"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Send email"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log level"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "More"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Less"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +604,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public Licence\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Add your App"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "More Apps"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Select an App"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Documentation:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "See application page at apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "See application website"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "User Documentation"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administrator Documentation"
@@ -507,7 +665,7 @@ msgstr "Show First Run Wizard again"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Password"
 
@@ -519,151 +677,149 @@ msgstr "Your password was changed"
 msgid "Unable to change your password"
 msgstr "Unable to change your password"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Current password"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "New password"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Change password"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Full Name"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Your email address"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Fill in an email address to enable password recovery"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Fill in an email address to enable password recovery and receive notifications"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profile picture"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Upload new"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Select new from Files"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Remove image"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Either png or jpg. Ideally square but you will be able to crop it."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Your avatar is provided by your original account."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Cancel"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Choose as profile image"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Language"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Help translate"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Encryption"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "The encryption app is no longer enabled, please decrypt all your files"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Log-in password"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Decrypt all Files"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Login Name"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Create"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Admin Recovery Password"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Enter the recovery password in order to recover the user's files during password change"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Default Storage"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Unlimited"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Other"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Username"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Storage"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "change full name"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "set new password"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Default"
diff --git a/l10n/en_GB/user_ldap.po b/l10n/en_GB/user_ldap.po
index b41d0ae021..334316ca9e 100644
--- a/l10n/en_GB/user_ldap.po
+++ b/l10n/en_GB/user_ldap.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mnestis <transifex@mnestis.net>, 2013
+# mnestis <transifex@mnestis.net>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+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"
@@ -87,43 +87,43 @@ msgstr "Success"
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Configuration OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Configuration incorrect"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Configuration incomplete"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Select groups"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Select object classes"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Select attributes"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Connection test succeeded"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Connection test failed"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Do you really want to delete the current Server Configuration?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Confirm Deletion"
 
@@ -141,11 +141,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s user found"
 msgstr[1] "%s users found"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Invalid Host"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Could not find the desired feature"
 
@@ -163,8 +163,8 @@ msgstr "Help"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Groups meeting these criteria are available in %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -199,8 +199,8 @@ msgid "groups found"
 msgstr "groups found"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "What attribute should be used as login name:"
+msgid "Users login with this attribute:"
+msgstr "Users login with this attribute:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -267,8 +267,8 @@ msgstr "You can specify Base DN for users and groups in the Advanced tab"
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Limit %s access to users meeting these criteria:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -410,41 +410,51 @@ msgstr "Group Search Attributes"
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Nested Groups"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)"
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Quota Field"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Quota Default"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Email Field"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "User Home Folder Naming Rule"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Internal Username"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +470,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Internal Username Attribute:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Override UUID detection"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +489,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID Attribute for Users:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID Attribute for Groups:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Username-LDAP User Mapping"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +515,10 @@ msgid ""
 "experimental stage."
 msgstr "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Clear Username-LDAP User Mapping"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Clear Groupname-LDAP Group Mapping"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 66aa1f14f4..c6fd33cd86 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Baptiste <baptiste+transifex@darthenay.fr>, 2013
-# Mariano <mstreet@kde.org.ar>, 2013
+# Mariano <mstreet@kde.org.ar>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +19,11 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s kunhavigis “%s” kun vi"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,20 +38,7 @@ msgstr ""
 
 #: ajax/update.php:17
 msgid "Updated database"
-msgstr ""
-
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
+msgstr "Ĝisdatiĝis datumbazo"
 
 #: avatar/controller.php:62
 msgid "No image or file provided"
@@ -60,11 +46,11 @@ msgstr ""
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
-msgstr ""
+msgstr "Ne konatas dosiertipo"
 
 #: avatar/controller.php:85
 msgid "Invalid image"
-msgstr ""
+msgstr "Ne validas bildo"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
@@ -74,135 +60,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "dimanĉo"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "lundo"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "mardo"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "merkredo"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "ĵaŭdo"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "vendredo"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "sabato"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januaro"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februaro"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Marto"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Aprilo"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Majo"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Aŭgusto"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Septembro"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktobro"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Novembro"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Decembro"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Konservante..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekundoj antaŭe"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "antaŭ %n minuto"
+msgstr[1] "antaŭ %n minutoj"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "antaŭ %n horo"
+msgstr[1] "antaŭ %n horoj"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "hodiaŭ"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "hieraŭ"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "antaŭ %n tago"
+msgstr[1] "antaŭ %n tagoj"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "antaŭ %n monato"
+msgstr[1] "antaŭ %n monatoj"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "monatoj antaŭe"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "jaroj antaŭe"
 
@@ -233,22 +223,22 @@ msgstr ""
 #: js/oc-dialogs.js:347
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{count} dosierkonflikto"
+msgstr[1] "{count} dosierkonfliktoj"
 
 #: js/oc-dialogs.js:361
 msgid "One file conflict"
-msgstr ""
+msgstr "Unu dosierkonflikto"
 
 #: js/oc-dialogs.js:367
 msgid "Which files do you want to keep?"
-msgstr ""
+msgstr "Kiujn dosierojn vi volas konservi?"
 
 #: js/oc-dialogs.js:368
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr ""
+msgstr "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo."
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
@@ -260,16 +250,36 @@ msgstr ""
 
 #: js/oc-dialogs.js:433 js/oc-dialogs.js:446
 msgid "(all selected)"
-msgstr ""
+msgstr "(ĉiuj elektitas)"
 
 #: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "({count} selected)"
-msgstr ""
+msgstr "({count} elektitas)"
 
 #: js/oc-dialogs.js:457
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Dividita"
@@ -278,12 +288,12 @@ msgstr "Dividita"
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Eraro"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Eraro dum kunhavigo"
 
@@ -295,123 +305,123 @@ msgstr "Eraro dum malkunhavigo"
 msgid "Error while changing permissions"
 msgstr "Eraro dum ŝanĝo de permesoj"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Kunhavigita kun vi kaj la grupo {group} de {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Kunhavigita kun vi de {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
-msgstr ""
+msgstr "Kunhavigi kun uzanto aŭ grupo..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
-msgstr ""
+msgstr "Konhavigi ligilon"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Protekti per pasvorto"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Pasvorto"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Retpoŝti la ligilon al ulo"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Sendi"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Agordi limdaton"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Limdato"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Kunhavigi per retpoŝto:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Ne troviĝis gento"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Rekunhavigo ne permesatas"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Kunhavigita en {item} kun {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
-msgstr ""
+msgstr "avizi per retpoŝto"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "povas redakti"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "alirkontrolo"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "krei"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "ĝisdatigi"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "forigi"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "kunhavigi"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protektita per pasvorto"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sendante..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "La retpoŝtaĵo sendiĝis"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Averto"
 
@@ -421,7 +431,7 @@ msgstr "Ne indikiĝis tipo de la objekto."
 
 #: js/tags.js:13
 msgid "Enter new"
-msgstr ""
+msgstr "Enigu novan"
 
 #: js/tags.js:27
 msgid "Delete"
@@ -433,7 +443,7 @@ msgstr "Aldoni"
 
 #: js/tags.js:39
 msgid "Edit tags"
-msgstr ""
+msgstr "Redakti etikedojn"
 
 #: js/tags.js:57
 msgid "Error loading dialog template: {error}"
@@ -441,11 +451,11 @@ msgstr ""
 
 #: js/tags.js:261
 msgid "No tags selected for deletion."
-msgstr ""
+msgstr "Neniu etikedo elektitas por forigo."
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr ""
+msgstr "Bonvolu reŝargi la paĝon."
 
 #: js/update.js:17
 msgid ""
@@ -458,11 +468,17 @@ msgstr "La ĝisdatigo estis malsukcese. Bonvolu raporti tiun problemon al la <a
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Uzu la jenan ligilon por restarigi vian pasvorton: {link}"
@@ -482,8 +498,8 @@ msgstr "La peto malsukcesis!<br />Ĉu vi certiĝis, ke via retpoŝto/uzantonomo
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Uzantonomo"
 
@@ -519,6 +535,18 @@ msgstr "Nova pasvorto"
 msgid "Reset password"
 msgstr "Rekomenci la pasvorton"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Persona"
@@ -527,7 +555,7 @@ msgstr "Persona"
 msgid "Users"
 msgstr "Uzantoj"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplikaĵoj"
 
@@ -541,23 +569,23 @@ msgstr "Helpo"
 
 #: tags/controller.php:22
 msgid "Error loading tags"
-msgstr ""
+msgstr "Eraris ŝargo de etikedoj"
 
 #: tags/controller.php:48
 msgid "Tag already exists"
-msgstr ""
+msgstr "La etikedo jam ekzistas"
 
 #: tags/controller.php:64
 msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "Eraris forigo de etikedo(j)"
 
 #: tags/controller.php:75
 msgid "Error tagging"
-msgstr ""
+msgstr "Eraris etikedado"
 
 #: tags/controller.php:86
 msgid "Error untagging"
-msgstr ""
+msgstr "Eraris maletikedado"
 
 #: tags/controller.php:97
 msgid "Error favoriting"
@@ -606,7 +634,7 @@ msgstr "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)"
 #: templates/installation.php:27
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure."
 
 #: templates/installation.php:33
 msgid ""
@@ -637,51 +665,49 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krei <strong>administran konton</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Progresinta"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datuma dosierujo"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Agordi la datumbazon"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "estos uzata"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datumbaza uzanto"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Datumbaza pasvorto"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Datumbaza nomo"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Datumbaza tabelospaco"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Datumbaza gastigo"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
-msgstr ""
+msgstr "Finante..."
 
 #: templates/layout.user.php:40
 msgid ""
@@ -695,7 +721,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Elsaluti"
 
@@ -719,29 +745,29 @@ msgstr ""
 
 #: templates/login.php:18
 msgid "Please contact your administrator."
-msgstr ""
+msgstr "Bonvolu kontakti vian administranton."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Ĉu vi perdis vian pasvorton?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "memori"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Ensaluti"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternativaj ensalutoj"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
@@ -760,7 +786,7 @@ msgstr ""
 
 #: templates/singleuser.user.php:7 templates/update.user.php:6
 msgid "Thank you for your patience."
-msgstr ""
+msgstr "Dankon pro via pacienco."
 
 #: templates/update.admin.php:3
 #, php-format
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index cb3d5db559..7518719c1a 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,283 +18,290 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Ne eblis movi %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Dosiernomo devas ne malpleni."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "La dosieronomo ne devas enhavi “/”. Bonvolu elekti malsaman nomon."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "La nomo %s jam uziĝas en la dosierujo %s. Bonvolu elekti malsaman nomon."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Nevalida fonto"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Eraris elŝuto de %s al %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Eraris la kreo de la dosiero"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "La dosierujnomo ne povas malpleni."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "La dosiernomo ne devas enhavi “/”. Bonvolu elekti malsaman nomon."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Eraris la kreo de la dosierujo"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Ne povis agordiĝi la alŝuta dosierujo."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Neniu dosiero alŝutiĝis. Nekonata eraro."
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: "
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "la alŝutita dosiero nur parte alŝutiĝis"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Neniu dosiero alŝutiĝis."
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Mankas provizora dosierujo."
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Malsukcesis skribo al disko"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Ne haveblas sufiĉa memoro"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "La alŝuto malsukcesis. Ne troviĝis alŝutota dosiero."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Nevalida dosierujo."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Dosieroj"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Ne haveblas sufiĉa spaco"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Ne povis ekhaviĝi rezulto el la servilo."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "La URL ne povas malpleni"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Ne povis kreiĝi dosiero"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Ne povis kreiĝi dosierujo"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Forigi por ĉiam"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Ne povis alinomiĝi dosiero"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "anstataŭiĝis {new_name} per {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dosierujo"
 msgstr[1] "%n dosierujoj"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n dosiero"
 msgstr[1] "%n dosieroj"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} kaj {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Alŝutatas %n dosiero"
 msgstr[1] "Alŝutatas %n dosieroj"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' ne estas valida dosiernomo."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Via memoro preskaŭ plenas ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Via elŝuto pretiĝatas. Ĉi tio povas daŭri iom da tempo se la dosieroj grandas."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Eraris movo de dosiero"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Eraro"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modifita"
 
@@ -302,12 +309,12 @@ msgstr "Modifita"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ne povis alinomiĝi"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Alŝuti"
 
@@ -343,72 +350,68 @@ msgstr "Maksimuma enirgrando por ZIP-dosieroj"
 msgid "Save"
 msgstr "Konservi"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nova"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Tekstodosiero"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nova dosierujo"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Dosierujo"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "El ligilo"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Forigitaj dosieroj"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Nuligi alŝuton"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Vi ne havas permeson alŝuti aŭ krei dosierojn ĉi tie"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas ĉi tie. Alŝutu ion!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Alŝuto tro larĝa"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Nuna skano"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Ĝisdatiĝas dosiersistema kaŝmemoro..."
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index a6984c3576..7fcbd73bde 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,18 +81,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Mankas neproj."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -100,9 +100,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Konservante..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index 15d4809452..da6e5db602 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Alirpermeso donita"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Eraro dum agordado de la memorservo Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Doni alirpermeson"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Eraro dum agordado de la memorservo Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Uzantoj"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Kapabligi malenan memorilon de uzanto"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Permesi al uzantoj surmeti siajn proprajn malenajn memorilojn"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Radikaj SSL-atestoj"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Enporti radikan ateston"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 98301b5390..e9123ea9db 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Kunhavigita de {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Ĉi tiu kunhavigo estas protektata per pasvorto"
@@ -54,32 +58,16 @@ msgstr "kunhavigo malkapablas"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s kunhavigis la dosierujon %s kun vi"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s kunhavigis la dosieron %s kun vi"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Elŝuti"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Alŝuti"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Nuligi alŝuton"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Ne haveblas antaŭvido por"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Direkta ligilo"
diff --git a/l10n/eo/files_trashbin.po b/l10n/eo/files_trashbin.po
index 2417a2e8c6..2da6d3501f 100644
--- a/l10n/eo/files_trashbin.po
+++ b/l10n/eo/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Ne povis foriĝi %s por ĉiam"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Ne povis restaŭriĝi %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Forigitaj dosieroj"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Eraro"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "restaŭrita"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nenio estas ĉi tie. Via rubujo malplenas!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nomo"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Restaŭri"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Forigita"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Forigitaj dosieroj"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index cceb200d02..61481d103b 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,59 +18,54 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Helpo"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Persona"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Agordo"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Uzantoj"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administranto"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
 #: private/avatar.php:66
 msgid "Unknown filetype"
-msgstr ""
+msgstr "Ne konatas dosiertipo"
 
 #: private/avatar.php:71
 msgid "Invalid image"
-msgstr ""
+msgstr "Ne validas bildo"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "TTT-servoj regataj de vi"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP-elŝuto estas malkapabligita."
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "La aplikaĵo ne estas kapabligita"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Aŭtentiga eraro"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Dosieroj"
@@ -200,8 +199,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "La uzantonomo de MySQL aŭ la pasvorto ne validas"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -228,21 +227,21 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "La uzanto de MySQL “%s”@“localhost” jam ekzistas."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Forigi ĉi tiun uzanton el MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "La uzanto de MySQL “%s”@“%%” jam ekzistas"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Forigi ĉi tiun uzanton el MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -269,66 +268,72 @@ msgstr "Starigi administran uzantonomon."
 msgid "Set an admin password."
 msgstr "Starigi administran pasvorton."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s kunhavigis “%s” kun vi"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Ne troviĝis kategorio “%s”"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekundoj antaŭe"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "antaŭ %n minutoj"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "antaŭ %n horoj"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "hodiaŭ"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "hieraŭ"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "antaŭ %n tagoj"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "lastamonate"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "antaŭ %n monatoj"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "lastajare"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "jaroj antaŭe"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 18451d02c5..74f444b43e 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "La retpoŝtaĵo sendiĝis"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Ĉifrado"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Ne eblis ŝargi liston el aplikaĵovendejo"
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Dokumentaro por uzantoj"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Malkapabligi"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Kapabligi"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Eraro"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Ĝisdatigi"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Konservante..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "malfari"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupoj"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupadministranto"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Forigi"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Esperanto"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Nenio"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Ensaluti"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sekureca averto"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Kunhavigo"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Kapabligi API-on por Kunhavigo"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Kapabligi ligilojn"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Kapabligi uzantojn kunhavigi erojn kun la publiko perligile"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Kapabligi rekunhavigon"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Kapabligi uzantojn kunhavigi kun ĉiu ajn"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Servila adreso"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Pordo"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Aŭtentigiloj"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Protokolo"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Registronivelo"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Pli"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Malpli"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Eldono"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +603,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Aldonu vian aplikaĵon"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Pli da aplikaĵoj"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Elekti aplikaĵon"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Dokumentaro por uzantoj"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentaro por administrantoj"
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -518,151 +676,149 @@ msgstr "Via pasvorto ŝanĝiĝis"
 msgid "Unable to change your password"
 msgstr "Ne eblis ŝanĝi vian pasvorton"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Nuna pasvorto"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Ŝanĝi la pasvorton"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Retpoŝto"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Via retpoŝta adreso"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profila bildo"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Nuligi"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Lingvo"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Helpu traduki"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Ĉifrado"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "Ensaluti"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Krei"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Defaŭlta konservejo"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Senlima"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Alia"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Uzantonomo"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Konservejo"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Defaŭlta"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 8ba0c5153c..1f0d5fdcec 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +87,43 @@ msgstr "Sukceso"
 msgid "Error"
 msgstr "Eraro"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Elekti grupojn"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Elekti objektoklasojn"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Elekti atribuojn"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Provo de konekto sukcesis"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Provo de konekto malsukcesis"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Konfirmi forigon"
 
@@ -141,11 +141,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s uzanto troviĝis"
 msgstr[1] "%s uzanto troviĝis"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Nevalida gastigo"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -163,7 +163,7 @@ msgstr "Helpo"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -199,7 +199,7 @@ msgid "groups found"
 msgstr "grupoj trovitaj"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -267,7 +267,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -410,41 +410,51 @@ msgstr "Atribuoj de gruposerĉo"
 msgid "Group-Member association"
 msgstr "Asocio de grupo kaj membro"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Specialaj atribuoj"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kampo de kvoto"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "duumoke"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Kampo de retpoŝto"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Ena uzantonomo"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +470,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atribuo de ena uzantonomo:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +489,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID-atribuo por uzantoj:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID-atribuo por grupoj:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +515,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index ed95b47d7f..758f1024ad 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -3,9 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Art O. Pal <artopal@fastmail.fm>, 2013
+# Art O. Pal <artopal@fastmail.fm>, 2013-2014
 # ggam <ggam@brainleakage.com>, 2013
-# I Robot <owncloud-bot@tmit.eu>, 2013
+# I Robot, 2013
 # juanman <juanma@kde.org.ar>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
 # pablomillaquen <pablomillaquen@gmail.com>, 2013
@@ -13,15 +13,17 @@
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
 # saskarip <saskarip@gmail.com>, 2013
 # saskarip <saskarip@gmail.com>, 2013
+# xsergiolpx <sergioballesterossolanas@gmail.com>, 2014
 # iGerli <stefano@aerosoles.net>, 2013
+# victormce <victormce@gmail.com>, 2014
 # xhiena <xhiena@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:10+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"PO-Revision-Date: 2014-03-28 06:06+0000\n"
+"Last-Translator: victormce <victormce@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,41 +31,27 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s ha compatido  »%s« contigo"
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Ha pasado la fecha de caducidad"
 
-#: ajax/share.php:169
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "No se pudo enviar el mensaje a los siguientes usuarios: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Modo mantenimiento activado"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Modo mantenimiento desactivado"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 msgid "Updated database"
 msgstr "Base de datos actualizada"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Actualizando caché de archivos, esto puede tardar bastante tiempo..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Caché de archivos actualizada"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% hecho ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No se especificó ningún archivo o imagen"
@@ -84,135 +72,139 @@ msgstr "No hay disponible una imagen temporal de perfil, pruebe de nuevo"
 msgid "No crop data provided"
 msgstr "No se proporcionó datos del recorte"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Enero"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Febrero"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mayo"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Septiembre"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Noviembre"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:869
+#: js/js.js:543
+msgid "Saving..."
+msgstr "Guardando..."
+
+#: js/js.js:1103
 msgid "seconds ago"
 msgstr "segundos antes"
 
-#: js/js.js:870
+#: js/js.js:1104
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: js/js.js:871
+#: js/js.js:1105
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: js/js.js:872
+#: js/js.js:1106
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:873
+#: js/js.js:1107
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:874
+#: js/js.js:1108
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: js/js.js:875
+#: js/js.js:1109
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:876
+#: js/js.js:1110
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: js/js.js:877
+#: js/js.js:1111
 msgid "months ago"
 msgstr "meses antes"
 
-#: js/js.js:878
+#: js/js.js:1112
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:879
+#: js/js.js:1113
 msgid "years ago"
 msgstr "años antes"
 
@@ -280,6 +272,26 @@ msgstr "({count} seleccionados)"
 msgid "Error loading file exists template"
 msgstr "Error cargando plantilla de archivo existente"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Contraseña muy débil"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Contraseña débil"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Contraseña pasable"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Contraseña buena"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Contraseña muy buena"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Compartido"
@@ -288,12 +300,12 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -305,123 +317,123 @@ msgstr "Error al dejar de compartir"
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permisos"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido contigo y el grupo {group} por {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Compartido contigo por {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Compartido con el usuario o con el grupo ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Enlace compartido"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Protección con contraseña"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Contraseña"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Permitir Subida Pública"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Enviar enlace por correo electrónico a una persona"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Compartir por correo electrónico:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "No se encontró gente"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
-msgstr "notificar al usuario por correo electrónico"
+msgstr "notificar por correo electrónico"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protegido con contraseña"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Precaución"
 
@@ -455,7 +467,7 @@ msgstr "No hay etiquetas seleccionadas para borrar."
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr "Vuelva a cargar la página."
+msgstr "Recargue/Actualice la página"
 
 #: js/update.js:17
 msgid ""
@@ -468,11 +480,17 @@ msgstr "La actualización ha fracasado. Por favor, informe de este problema a la
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s restablecer contraseña"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Ocurrió un problema al enviar el mensaje de correo electrónico. Contacte a su administrador."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Utilice el siguiente enlace para restablecer su contraseña: {link}"
@@ -492,8 +510,8 @@ msgstr "La petición ha fallado! <br> ¿Está seguro de que su dirección de cor
 msgid "You will receive a link to reset your password via Email."
 msgstr "Recibirá un enlace por correo electrónico para restablecer su contraseña"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nombre de usuario"
 
@@ -529,6 +547,18 @@ msgstr "Nueva contraseña"
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! "
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Para óptimos resultados, considere utilizar un servidor GNU/Linux."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -537,7 +567,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usuarios"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplicaciones"
 
@@ -647,49 +677,47 @@ msgstr "Para información de cómo configurar apropiadamente su servidor, por fa
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avanzado"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Almacenamiento y base de datos"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Directorio de datos"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "se utilizarán"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Finalizando..."
 
@@ -705,7 +733,7 @@ msgstr "Esta aplicación requiere que se habilite JavaScript para su correcta op
 msgid "%s is available. Get more information on how to update."
 msgstr "%s esta disponible. Obtener mas información de como actualizar."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Salir"
 
@@ -731,28 +759,28 @@ msgstr "La autenticación a fallado en el servidor."
 msgid "Please contact your administrator."
 msgstr "Por favor, contacte con el administrador."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "¿Ha perdido su contraseña?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "recordar"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Inicios de sesión alternativos"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hola:<br><br>tan solo queremos informarte que %s compartió «%s» contigo.<br><a href=\"%s\">¡Míralo acá!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Hola:<br><br>Te comentamos que %s compartió <strong>%s</strong> contigo.<br><a href=\"%s\">¡Échale un vistazo!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
@@ -784,4 +812,4 @@ msgstr "Esta versión de owncloud se está actualizando, esto puede demorar un t
 
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
-msgstr "Por favor , recargue esta instancia de onwcloud tras un corto periodo de tiempo y continue usándolo."
+msgstr "Por favor, recargue la página tras un corto periodo de tiempo para continuar usando ownCloud"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 0cfd42968e..b9d0e700b3 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Art O. Pal <artopal@fastmail.fm>, 2013
+# Art O. Pal <artopal@fastmail.fm>, 2013-2014
 # ggam <ggam@brainleakage.com>, 2013
 # japaol <japaol@gmail.com>, 2013
 # juanman <juanma@kde.org.ar>, 2013
@@ -12,13 +12,14 @@
 # qdneren <renanqd@yahoo.com.mx>, 2013
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
 # saskarip <saskarip@gmail.com>, 2013
+# victormce <victormce@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:10+0000\n"
-"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,283 +27,290 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "No se pudo mover %s - Ya existe un archivo con ese nombre."
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "No se pudo mover %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "El nombre de archivo no puede estar vacío."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "El nombre del archivo, NO puede contener el simbolo\"/\", por favor elija un nombre diferente."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" es un nombre de archivo inválido."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "La carpeta destino fue movida o eliminada."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "El nombre %s ya está en uso por la carpeta %s. Por favor elija uno diferente."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
-msgstr "No es un origen válido"
+msgstr "No es una fuente válida"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
-msgstr "El servidor no puede acceder URLs; revise la configuración del servidor."
+msgstr "La configuración del servidor no le permite abrir URLs, revísela."
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Error mientras se descargaba %s a %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Error al crear el archivo"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "El nombre de la carpeta no puede estar vacío."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "El nombre de la carpeta, NO puede contener el simbolo\"/\", por favor elija un nombre diferente."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Error al crear la carpeta."
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Incapaz de crear directorio de subida."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Token Inválido"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "No se subió ningún archivo. Error desconocido"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "No hubo ningún problema, el archivo se subió con éxito"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "El archivo subido sobrepasa la directiva 'upload_max_filesize' en php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo subido sobrepasa la directiva 'MAX_FILE_SIZE' especificada en el formulario HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo subido fue sólo subido parcialmente"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "No se subió ningún archivo"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Falta la carpeta temporal"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Falló al escribir al disco"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Actualización fallida. No se pudo obtener información del archivo."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Actualización fallida. No se pudo encontrar el archivo subido"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Actualización fallida. No se pudo obtener información del archivo."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Archivos"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "El tamaño total del archivo {size1} excede el límite {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "No se pudo obtener respuesta del servidor."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "La dirección URL no puede estar vacía"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
-msgstr "En la carpeta de inicio, 'Shared' es un nombre reservado"
+msgstr "En la carpeta home, no se puede usar 'Shared'"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "No se pudo crear el archivo"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "No se pudo crear la carpeta"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Error al descargar URL."
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
-msgstr "Error borrando el archivo."
+msgstr "Error al borrar el archivo"
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetas"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} y {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
 msgstr[1] "Subiendo %n archivos"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' no es un nombre de archivo válido."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" es un nombre de archivo inválido."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "La clave privada no es válida para la app de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Error moviendo archivo"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
@@ -310,12 +318,12 @@ msgstr "Modificado"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nombre de carpeta inválido. El uso de \"Shared\" esta reservado."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s no pudo ser renombrado"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Subir"
 
@@ -351,72 +359,68 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Nuevo archivo de texto"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Archivos eliminados"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "No tienes permisos para subir o crear archivos aquí."
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada aquí. ¡Suba algo!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Subida demasido grande"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Los archivos están siendo escaneados,  por favor espere."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Escaneo actual"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Actualizando caché del sistema de archivos..."
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index cb14c25e46..50f8edbd47 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Art O. Pal <artopal@fastmail.fm>, 2013
+# Art O. Pal <artopal@fastmail.fm>, 2013-2014
 # asaez <asaez@asaez.eu>, 2013
 # gmoriello <gmoriello@gmail.com>, 2013
 # japaol <japaol@gmail.com>, 2013
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-11-29 22:20+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 15:20+0000\n"
+"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,18 +92,18 @@ msgid ""
 "administrator"
 msgstr "Error desconocido. Verifique la configuración de su sistema o póngase en contacto con su administrador"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Requisitos incompletos."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
 
@@ -111,9 +111,9 @@ msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Encriptación iniciada..... Esto puede tomar un tiempo. Por favor espere."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Guardando..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Cifrado inicial en curso... Inténtelo más tarde."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 503d6f1758..98e23a43c5 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Art O. Pal <artopal@fastmail.fm>, 2014
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Rubén del Campo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 15:31+0000\n"
+"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +19,44 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acceso concedido"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Error configurando el almacenamiento de Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Conceder acceso"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Error configurando el almacenamiento de Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Guardado"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +108,22 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Habilitar almacenamiento externo de usuario"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
+msgid "Allow users to mount the following external storage"
+msgstr "Permitir a los usuarios montar el siguiente almacenamiento externo"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Certificados raíz SSL"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importar certificado raíz"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index e4fa41f4c8..f44f8bcb5b 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Art O. Pal <artopal@fastmail.fm>, 2013
+# Art O. Pal <artopal@fastmail.fm>, 2013-2014
 # Dominique Couot <dcouot@hotmail.com>, 2013
 # juanman <juanma@kde.org.ar>, 2013
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: Rubén del Campo <yo@rubendelcampo.es>\n"
+"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"PO-Revision-Date: 2014-03-28 06:16+0000\n"
+"Last-Translator: victormce <victormce@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +21,10 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Compartido por {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Este elemento compartido esta protegido por contraseña"
@@ -57,32 +61,16 @@ msgstr "compartir está desactivado"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mayor información, contacte a la persona que le envió el enlace."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s compartió la carpeta %s contigo"
+msgid "shared by %s"
+msgstr "Compartido por %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s compartió el fichero %s contigo"
+msgid "Download %s"
+msgstr "Descargar %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Descargar"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Subir"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Cancelar subida"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "No hay vista previa disponible para"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Enlace directo"
diff --git a/l10n/es/files_trashbin.po b/l10n/es/files_trashbin.po
index 186909f350..2586fb2af3 100644
--- a/l10n/es/files_trashbin.po
+++ b/l10n/es/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"PO-Revision-Date: 2014-03-28 06:24+0000\n"
+"Last-Translator: victormce <victormce@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +19,48 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "No se puede eliminar %s permanentemente"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "No se puede restaurar %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Archivos eliminados"
+
+#: js/trash.js:16 js/trash.js:108 js/trash.js:157
 msgid "Error"
 msgstr "Error"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:859 lib/trashbin.php:861
 msgid "restored"
 msgstr "recuperado"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "No hay nada aquí. ¡Tu papelera esta vacía!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Recuperar"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Archivos Eliminados"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 6e80e0b1fe..994e3b4d6e 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,18 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Art O. Pal <artopal@fastmail.fm>, 2014
 # Dharth <emilpg@gmail.com>, 2013
 # pablomillaquen <pablomillaquen@gmail.com>, 2013
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
+# victormce <victormce@gmail.com>, 2014
 # xhiena <xhiena@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 15:31+0000\n"
+"Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,38 +24,38 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud"
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "No se ha especificado nombre de la aplicación"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Ayuda"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Ajustes"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Usuarios"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administración"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Falló la actualización \"%s\"."
@@ -66,15 +68,10 @@ msgstr "Tipo de archivo desconocido"
 msgid "Invalid image"
 msgstr "Imagen inválida"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Servicios web bajo su control"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "No se puede abrir \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
@@ -95,76 +92,80 @@ msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
-msgstr "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente a su administrador."
+msgstr "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente su administrador."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "No se ha especificado origen cuando se ha instalado la aplicación"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "No href especificado cuando se ha instalado la aplicación"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Sin path especificado  cuando se ha instalado la aplicación desde el fichero local"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Ficheros de tipo %s no son soportados"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Fallo de apertura de fichero mientras se instala la aplicación"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "La aplicación no suministra un fichero info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "La aplicación no puede ser instalada por tener código no autorizado en la aplicación"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "El directorio de la aplicación ya existe"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "La aplicación no está habilitada"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Error de autenticación"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token expirado. Por favor, recarga la página."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Usuario desconocido"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Archivos"
@@ -204,8 +205,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Tiene que ingresar una cuenta existente o la del administrador."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Usuario y/o contraseña de MySQL no válidos"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "Nombre de usuario o contraseña de MySQL/MariaDB inválidos"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -232,21 +233,21 @@ msgstr "Comando infractor: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Usuario MySQL '%s'@'localhost' ya existe."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "El usuario de MySQL/MariaDB '%s'@'localhost' ya existe."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Eliminar este usuario de MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Eliminar este usuario de MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Usuario MySQL '%s'@'%%' ya existe"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "El usuario de MySQL/MariaDB '%s'@'%%' ya existe"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Eliminar este usuario de MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Eliminar este usuario de MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -273,66 +274,72 @@ msgstr "Configurar un nombre de usuario del administrador"
 msgid "Set an admin password."
 msgstr "Configurar la contraseña del administrador."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s ha compatido  »%s« contigo"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "No puede encontrar la categoria \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "hoy"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ayer"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "mes pasado"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "año pasado"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "hace años"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 6ff8c4bf8e..0a625464a1 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -3,11 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Art O. Pal <artopal@fastmail.fm>, 2013
+# Art O. Pal <artopal@fastmail.fm>, 2013-2014
 # asaez <asaez@asaez.eu>, 2013
 # eadeprado <eadeprado@outlook.com>, 2013
 # ggam <ggam@brainleakage.com>, 2013
 # japaol <japaol@gmail.com>, 2013
+# Jose Luis Tirado <joseluis.tirado@gmail.com>, 2014
 # juanman <juanma@kde.org.ar>, 2013
 # pablomillaquen <pablomillaquen@gmail.com>, 2013
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
@@ -15,12 +16,13 @@
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
 # saskarip <saskarip@gmail.com>, 2013
 # scambra <sergio@programatica.es>, 2013
+# victormce <victormce@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-05 22:23-0500\n"
-"PO-Revision-Date: 2013-12-05 15:41+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 22:10+0000\n"
 "Last-Translator: Art O. Pal <artopal@fastmail.fm>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -29,6 +31,48 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Se introdujo un valor inválido para %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Guardado"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "probar configuración de correo"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Ocurrió un problema la enviar el mensaje. Revise la configuración."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Correo electrónico enviado"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Modo de envío"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Método de autenticación"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "No se pudo cargar la lista desde el App Store"
@@ -125,62 +169,90 @@ msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado
 msgid "Unable to change password"
 msgstr "No se ha podido cambiar la contraseña"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Enviando..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Documentación de usuario"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Documentación para administradores"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Actualizado a {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Activar"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Espere, por favor...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Error mientras se desactivaba la aplicación"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Error mientras se activaba la aplicación"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Actualizando...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Error mientras se actualizaba la aplicación"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Actualizar"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Seleccionar una imagen de perfil"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Contraseña muy débil"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Contraseña débil"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Contraseña pasable"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Contraseña buena"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Contraseña muy buena"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Guardando..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "eliminado"
@@ -193,40 +265,40 @@ msgstr "deshacer"
 msgid "Unable to remove user"
 msgstr "Imposible eliminar al usuario"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Administrador del Grupo"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "añadir Grupo"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Se debe proporcionar un nombre de usuario válido"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Error al crear usuario"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Se debe proporcionar una contraseña válida"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe."
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Castellano"
 
@@ -250,18 +322,42 @@ msgstr "Errores y problemas fatales"
 msgid "Fatal issues only"
 msgstr "Problemas fatales solamente"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ninguno"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Plano"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "Gestor de NT LAN"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:25
+#: 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 "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS."
 
-#: templates/admin.php:39
+#: 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 "
@@ -270,68 +366,68 @@ msgid ""
 "root."
 msgstr "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Advertencia de configuración"
 
-#: templates/admin.php:53
+#: 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 "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "No se ha encontrado el módulo \"fileinfo\""
 
-#: templates/admin.php:68
+#: 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 "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
-msgstr "Su versión de PHP ha caducado"
+msgstr "Su versión de PHP no está actualizada"
 
-#: templates/admin.php:82
+#: 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 "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "La configuración regional no está funcionando"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "No se puede escoger una configuración regional que soporte UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos."
 
-#: templates/admin.php:106
+#: 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 "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. "
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "La conexión a Internet no está funcionando"
 
-#: templates/admin.php:121
+#: 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 "
@@ -340,118 +436,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Cron fue ejecutado por última vez a las %s."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "¡Cron aún no ha sido ejecutado!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Ejecutar una tarea con cada página cargada"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Utiliza el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activar API de Compartición"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir re-compartición"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquier persona"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir notificaciones por correo electrónico"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Permitir al usuario enviar notificaciones por correo electrónico de archivos compartidos"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Servidor de correo electrónico"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Esto se usa para enviar notificaciones."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Desde la dirección"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Se necesita autenticación"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Dirección del servidor"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Puerto"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Credenciales"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "Nombre de usuario SMTP"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "Contraseña SMTP"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Probar configuración de correo electrónico"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Enviar mensaje"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -461,30 +617,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Añade tu aplicación"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Más aplicaciones"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Documentación:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver la página de aplicaciones en apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Ver sitio web de la aplicación"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Documentación de usuario"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentación de administrador"
@@ -518,7 +678,7 @@ msgstr "Mostrar nuevamente el Asistente de ejecución inicial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contraseña"
 
@@ -530,151 +690,149 @@ msgstr "Su contraseña ha sido cambiada"
 msgid "Unable to change your password"
 msgstr "No se ha podido cambiar su contraseña"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Su dirección de correo"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Escriba una dirección de correo electrónico para restablecer la contraseña"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Introducir una dirección de correo electrónico  para activar la recuperación de contraseñas y recibir notificaciones"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Foto de perfil"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Subir otra"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Seleccionar otra desde Archivos"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Borrar imagen"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Su avatar es proporcionado por su cuenta original."
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Seleccionar como imagen de perfil"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Ayúdanos a traducir"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
-msgstr "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>"
+msgstr "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Cifrado"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "La aplicación de cifrado ya no está activada, descifre todos sus archivos"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Contraseña de acceso"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Descifrar archivos"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Nombre de usuario"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Recuperación de la contraseña de administración"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña."
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Almacenamiento predeterminado"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "cambiar el nombre completo"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "establecer nueva contraseña"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 4f999d4127..81a43116f9 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -4,19 +4,21 @@
 # 
 # Translators:
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
+# Jose Luis Tirado <joseluis.tirado@gmail.com>, 2014
 # Maenso <balero_arana@hotmail.com>, 2013
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2013
 # ordenet <roberto@ordenet.com>, 2013
 # Rodrigo Rodríguez <roirobo@ubuntu.org.ni>, 2013
 # Rubén del Campo <yo@rubendelcampo.es>, 2013
+# victormce <victormce@gmail.com>, 2014
 # xhiena <xhiena@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: Jose Luis Tirado <joseluis.tirado@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,43 +95,43 @@ msgstr "Éxito"
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
-msgstr "Configuración OK"
+msgstr "Configuración Correcta"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Configuración Incorrecta"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Configuración incompleta"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Seleccionar grupos"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Seleccionar la clase de objeto"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Seleccionar atributos"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "La prueba de conexión fue exitosa"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "La prueba de conexión falló"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "¿Realmente desea eliminar la configuración actual del servidor?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Confirmar eliminación"
 
@@ -147,11 +149,11 @@ msgid_plural "%s users found"
 msgstr[0] "Usuario %s encontrado"
 msgstr[1] "Usuarios %s encontrados"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Host inválido"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "No se puede encontrar la función deseada."
 
@@ -169,8 +171,8 @@ msgstr "Ayuda"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Limitar el acceso a %s a los grupos que cumplan este criterio:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Los grupos que cumplen estos criterios están disponibles en %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -205,8 +207,8 @@ msgid "groups found"
 msgstr "grupos encontrados"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Que atributo debe ser usado como login:"
+msgid "Users login with this attribute:"
+msgstr "Los usuarios inician sesión con este atributo:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -273,8 +275,8 @@ msgstr "Puede especificar el DN base para usuarios y grupos en la pestaña Avanz
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Limitar el acceso a %s a los usuarios que cumplan el siguiente criterio:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Limitar el acceso a %s a los usuarios que cumplan estos criterios:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -416,41 +418,51 @@ msgstr "Atributos de busqueda de grupo"
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Grupos anidados"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Cuando se active, se permitirán grupos que contenga otros grupos (solo funciona si el atributo de miembro de grupo contiene DNs)."
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Atributos especiales"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Cuota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "E-mail"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Regla para la carpeta Home de usuario"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Nombre de usuario interno"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -466,15 +478,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atributo Nombre de usuario Interno:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Sobrescribir la detección UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -485,19 +497,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Atributo UUID para usuarios:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Atributo UUID para Grupos:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -511,10 +523,10 @@ msgid ""
 "experimental stage."
 msgstr "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 598b6b7cf1..3250550af8 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # cjtess <claudio.tessone@gmail.com>, 2013
+# cnngimenez, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,15 +19,14 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s compartió \"%s\" con vos"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "No se pudieron mandar correos a los siguientes usuarios: %s"
 
 #: ajax/update.php:11
 msgid "Turned on maintenance mode"
@@ -40,22 +40,9 @@ msgstr "Modo de mantenimiento desactivado"
 msgid "Updated database"
 msgstr "Base de datos actualizada"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Actualizando caché de archivos, esto puede tardar mucho tiempo..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Caché de archivos actualizada"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% hecho ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
-msgstr ""
+msgstr "No se ha proveído de una imágen o archivo."
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
@@ -67,141 +54,145 @@ msgstr "Imagen inválida"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "No hay una imágen temporal del perfil disponible, intente de nuevo"
 
 #: avatar/controller.php:135
 msgid "No crop data provided"
-msgstr ""
+msgstr "No se proveyeron datos de recorte"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "enero"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "febrero"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "marzo"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "mayo"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "junio"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "julio"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "septiembre"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "octubre"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "noviembre"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "diciembre"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Configuración"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Guardando..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "años atrás"
 
@@ -211,7 +202,7 @@ msgstr "Elegir"
 
 #: js/oc-dialogs.js:146
 msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Error cargando la plantilla del selector de archivo: {error}"
 
 #: js/oc-dialogs.js:172
 msgid "Yes"
@@ -227,27 +218,27 @@ msgstr "Aceptar"
 
 #: js/oc-dialogs.js:219
 msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Error cargando la plantilla del mensaje: {error}"
 
 #: js/oc-dialogs.js:347
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "un archivo en conflicto"
+msgstr[1] "{count} archivos en conflicto"
 
 #: js/oc-dialogs.js:361
 msgid "One file conflict"
-msgstr ""
+msgstr "Un archivo en conflicto"
 
 #: js/oc-dialogs.js:367
 msgid "Which files do you want to keep?"
-msgstr ""
+msgstr "¿Qué archivos deseas retener?"
 
 #: js/oc-dialogs.js:368
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr ""
+msgstr "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre."
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
@@ -255,18 +246,38 @@ msgstr "Cancelar"
 
 #: js/oc-dialogs.js:386
 msgid "Continue"
-msgstr ""
+msgstr "Continuar"
 
 #: js/oc-dialogs.js:433 js/oc-dialogs.js:446
 msgid "(all selected)"
-msgstr ""
+msgstr "(todos están seleccionados)"
 
 #: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "({count} selected)"
-msgstr ""
+msgstr "({count} seleccionados)"
 
 #: js/oc-dialogs.js:457
 msgid "Error loading file exists template"
+msgstr "Error cargando la plantilla de archivo existente"
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
 msgstr ""
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
@@ -277,12 +288,12 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -294,123 +305,123 @@ msgstr "Error en al dejar de compartir"
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permisos"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido con vos y el grupo {group} por {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vos por {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
-msgstr ""
+msgstr "Compartir con usuario o grupo ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
-msgstr ""
+msgstr "Compartir vínculo"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Proteger con contraseña "
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Contraseña"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Permitir Subida Pública"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Enviar el enlace por e-mail."
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Mandar"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Asignar fecha de vencimiento"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Fecha de vencimiento"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Compartir a través de e-mail:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "No se encontraron usuarios"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "No se permite volver a compartir"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
-msgstr ""
+msgstr "notificar por correo"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "podés editar"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "borrar"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Error al remover la fecha de vencimiento"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Mandando..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "e-mail mandado"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Atención"
 
@@ -420,7 +431,7 @@ msgstr "El tipo de objeto no está especificado. "
 
 #: js/tags.js:13
 msgid "Enter new"
-msgstr ""
+msgstr "Entrar nuevo"
 
 #: js/tags.js:27
 msgid "Delete"
@@ -432,19 +443,19 @@ msgstr "Agregar"
 
 #: js/tags.js:39
 msgid "Edit tags"
-msgstr ""
+msgstr "Editar etiquetas"
 
 #: js/tags.js:57
 msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "Error cargando la plantilla de dialogo: {error}"
 
 #: js/tags.js:261
 msgid "No tags selected for deletion."
-msgstr ""
+msgstr "No se han seleccionado etiquetas para eliminar."
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr ""
+msgstr "Por favor, recargue la página."
 
 #: js/update.js:17
 msgid ""
@@ -457,11 +468,17 @@ msgstr "La actualización no pudo ser completada. Por favor, reportá el inconve
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización fue exitosa. Estás siendo redirigido a ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s restablecer contraseña"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Usá este enlace para restablecer tu contraseña: {link}"
@@ -481,8 +498,8 @@ msgstr "¡Error en el pedido! <br> ¿Estás seguro de que tu dirección de corre
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nombre de usuario"
 
@@ -518,6 +535,18 @@ msgstr "Nueva contraseña:"
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -526,7 +555,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usuarios"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -540,31 +569,31 @@ msgstr "Ayuda"
 
 #: tags/controller.php:22
 msgid "Error loading tags"
-msgstr ""
+msgstr "Error cargando las etiquetas"
 
 #: tags/controller.php:48
 msgid "Tag already exists"
-msgstr ""
+msgstr "La etiqueta ya existe"
 
 #: tags/controller.php:64
 msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "Error borrando etiquetas(s)"
 
 #: tags/controller.php:75
 msgid "Error tagging"
-msgstr ""
+msgstr "Error al etiquetar"
 
 #: tags/controller.php:86
 msgid "Error untagging"
-msgstr ""
+msgstr "Error al sacar la etiqueta"
 
 #: tags/controller.php:97
 msgid "Error favoriting"
-msgstr ""
+msgstr "Error al favorecer"
 
 #: tags/controller.php:108
 msgid "Error unfavoriting"
-msgstr ""
+msgstr "Error al desfavorecer"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -582,16 +611,16 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "¡Hola!\n\nsólo te quería decir que %s acaba de compartir %s contigo.\nVerlo: %s\n\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s."
-msgstr ""
+msgstr "El compartir expirará en %s."
 
 #: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
-msgstr ""
+msgstr "¡Saludos!"
 
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
@@ -636,65 +665,63 @@ msgstr "Para información sobre cómo configurar apropiadamente tu servidor, por
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avanzado"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "se usarán"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Huésped de la base de datos"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
-msgstr ""
+msgstr "Finalizando..."
 
 #: templates/layout.user.php:40
 msgid ""
 "This application requires JavaScript to be enabled for correct operation.  "
 "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
 "JavaScript</a> and re-load this interface."
-msgstr ""
+msgstr "Esta aplicación requiere de JavaScript para su correcto funcionamiento. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> y recargue."
 
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponible. Obtené más información sobre cómo actualizar."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Cerrar la sesión"
 
@@ -714,52 +741,52 @@ msgstr "Por favor, cambiá tu contraseña para incrementar la seguridad de tu cu
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
-msgstr ""
+msgstr "¡Falló la autenticación del servidor!"
 
 #: templates/login.php:18
 msgid "Please contact your administrator."
-msgstr ""
+msgstr "Por favor, contacte a su administrador."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "¿Perdiste tu contraseña?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "recordame"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Nombre alternativos de usuarios"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
-msgstr ""
+msgstr "Esta instancia de ownCloud está en modo de usuario único."
 
 #: templates/singleuser.user.php:4
 msgid "This means only administrators can use the instance."
-msgstr ""
+msgstr "Esto significa que solo administradores pueden usar esta instancia."
 
 #: templates/singleuser.user.php:5 templates/update.user.php:5
 msgid ""
 "Contact your system administrator if this message persists or appeared "
 "unexpectedly."
-msgstr ""
+msgstr "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente."
 
 #: templates/singleuser.user.php:7 templates/update.user.php:6
 msgid "Thank you for your patience."
-msgstr ""
+msgstr "Gracias por su paciencia."
 
 #: templates/update.admin.php:3
 #, php-format
@@ -769,8 +796,8 @@ msgstr "Actualizando ownCloud a la versión %s, puede demorar un rato."
 #: templates/update.user.php:3
 msgid ""
 "This ownCloud instance is currently being updated, which may take a while."
-msgstr ""
+msgstr "Esta instancia de ownClod está siendo actualizada, puede tardar un momento."
 
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
-msgstr ""
+msgstr "Por favor, recargue esta página después de un tiempo para continuar usando ownCloud."
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index 85f0e08744..02f0efea9b 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -5,15 +5,15 @@
 # Translators:
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 # cjtess <claudio.tessone@gmail.com>, 2013
-# cnngimenez, 2013
+# cnngimenez, 2013-2014
 # juliabis, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,296 +21,303 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "No se pudo mover %s - Un archivo con este nombre ya existe"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "No se pudo mover %s "
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "El nombre del archivo no puede quedar vacío."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:63
 #, php-format
-msgid ""
-"The name %s is already used in the folder %s. Please choose a different "
-"name."
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:81
-msgid "Not a valid source"
-msgstr ""
-
-#: ajax/newfile.php:86
-msgid ""
-"Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
-
-#: ajax/newfile.php:103
-#, php-format
-msgid "Error while downloading %s to %s"
-msgstr ""
-
-#: ajax/newfile.php:140
-msgid "Error when creating the file"
-msgstr ""
-
-#: ajax/newfolder.php:21
-msgid "Folder name cannot be empty."
-msgstr ""
-
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
-msgid "Error when creating the folder"
-msgstr ""
-
-#: ajax/upload.php:18 ajax/upload.php:50
-msgid "Unable to set upload directory."
-msgstr "No fue posible crear el directorio de subida."
-
-#: ajax/upload.php:27
-msgid "Invalid Token"
-msgstr "Token Inválido"
-
-#: ajax/upload.php:64
-msgid "No file was uploaded. Unknown error"
-msgstr "El archivo no fue subido. Error desconocido"
-
-#: ajax/upload.php:71
-msgid "There is no error, the file uploaded with success"
-msgstr "No hay errores, el archivo fue subido con éxito"
-
-#: ajax/upload.php:72
-msgid ""
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:"
-
-#: ajax/upload.php:74
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML"
-
-#: ajax/upload.php:75
-msgid "The uploaded file was only partially uploaded"
-msgstr "El archivo fue subido parcialmente"
-
-#: ajax/upload.php:76
-msgid "No file was uploaded"
-msgstr "No se subió ningún archivo "
-
-#: ajax/upload.php:77
-msgid "Missing a temporary folder"
-msgstr "Falta un directorio temporal"
-
-#: ajax/upload.php:78
-msgid "Failed to write to disk"
-msgstr "Error al escribir en el disco"
-
-#: ajax/upload.php:96
-msgid "Not enough storage available"
-msgstr "No hay suficiente almacenamiento"
-
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
-msgid "Upload failed. Could not find uploaded file"
-msgstr ""
-
-#: ajax/upload.php:172
-msgid "Invalid directory."
-msgstr "Directorio inválido."
-
-#: appinfo/app.php:11
-msgid "Files"
-msgstr "Archivos"
-
-#: js/file-upload.js:228
-msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
-
-#: js/file-upload.js:306
-msgid "Upload cancelled."
-msgstr "La subida fue cancelada"
-
-#: js/file-upload.js:344
-msgid "Could not get result from server."
-msgstr ""
-
-#: js/file-upload.js:436
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
-
-#: js/file-upload.js:523
-msgid "URL cannot be empty"
-msgstr ""
-
-#: js/file-upload.js:527 js/filelist.js:377
-msgid "In the home folder 'Shared' is a reserved filename"
-msgstr ""
-
-#: js/file-upload.js:529 js/filelist.js:379
-msgid "{new_name} already exists"
-msgstr "{new_name} ya existe"
-
-#: js/file-upload.js:595
-msgid "Could not create file"
-msgstr ""
-
-#: js/file-upload.js:611
-msgid "Could not create folder"
-msgstr ""
-
-#: js/file-upload.js:661
-msgid "Error fetching URL"
-msgstr ""
-
-#: js/fileactions.js:125
-msgid "Share"
-msgstr "Compartir"
-
-#: js/fileactions.js:137
-msgid "Delete permanently"
-msgstr "Borrar permanentemente"
-
-#: js/fileactions.js:194
-msgid "Rename"
-msgstr "Cambiar nombre"
-
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
-msgid "Pending"
-msgstr "Pendientes"
-
-#: js/filelist.js:405
-msgid "Could not rename file"
-msgstr ""
-
-#: js/filelist.js:539
-msgid "replaced {new_name} with {old_name}"
-msgstr "se reemplazó {new_name} con {old_name}"
-
-#: js/filelist.js:539
-msgid "undo"
-msgstr "deshacer"
-
-#: js/filelist.js:591
-msgid "Error deleting file."
-msgstr ""
-
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n carpeta"
-msgstr[1] "%n carpetas"
-
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n archivo"
-msgstr[1] "%n archivos"
-
-#: js/filelist.js:617
-msgid "{dirs} and {files}"
-msgstr "{carpetas} y {archivos}"
-
-#: js/filelist.js:828 js/filelist.js:866
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
-msgstr[0] "Subiendo %n archivo"
-msgstr[1] "Subiendo %n archivos"
-
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' es un nombre de archivo inválido."
-
-#: js/files.js:81
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos."
 
-#: js/files.js:93
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr "El nombre %s está en uso en el directorio %s. Por favor elija un otro nombre."
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr "No es una fuente válida"
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr "El servidor no está permitido abrir las URLs, por favor chequee la configuración del servidor"
+
+#: ajax/newfile.php:119
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr "Error mientras se descargaba %s a %s"
+
+#: ajax/newfile.php:156
+msgid "Error when creating the file"
+msgstr "Error al crear el archivo"
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr "El nombre del directorio no puede estar vacío."
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr "Error al crear el directorio"
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr "No fue posible crear el directorio de subida."
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr "Token Inválido"
+
+#: ajax/upload.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr "El archivo no fue subido. Error desconocido"
+
+#: ajax/upload.php:78
+msgid "There is no error, the file uploaded with success"
+msgstr "No hay errores, el archivo fue subido con éxito"
+
+#: ajax/upload.php:79
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:"
+
+#: ajax/upload.php:81
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML"
+
+#: ajax/upload.php:82
+msgid "The uploaded file was only partially uploaded"
+msgstr "El archivo fue subido parcialmente"
+
+#: ajax/upload.php:83
+msgid "No file was uploaded"
+msgstr "No se subió ningún archivo "
+
+#: ajax/upload.php:84
+msgid "Missing a temporary folder"
+msgstr "Falta un directorio temporal"
+
+#: ajax/upload.php:85
+msgid "Failed to write to disk"
+msgstr "Error al escribir en el disco"
+
+#: ajax/upload.php:103
+msgid "Not enough storage available"
+msgstr "No hay suficiente almacenamiento"
+
+#: ajax/upload.php:160
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Falló la carga. No se pudo encontrar el archivo subido."
+
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Falló la carga. No se pudo obtener la información del archivo."
+
+#: ajax/upload.php:189
+msgid "Invalid directory."
+msgstr "Directorio inválido."
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr "Archivos"
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes."
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
+msgid "Upload cancelled."
+msgstr "La subida fue cancelada"
+
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr "No se pudo obtener resultados del servidor."
+
+#: js/file-upload.js:477
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará."
+
+#: js/file-upload.js:564
+msgid "URL cannot be empty"
+msgstr "La URL no puede estar vacía"
+
+#: js/file-upload.js:568
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr "En el directorio inicial 'Shared' es un nombre de archivo reservado"
+
+#: js/file-upload.js:570 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr "{new_name} ya existe"
+
+#: js/file-upload.js:636
+msgid "Could not create file"
+msgstr "No se pudo crear el archivo"
+
+#: js/file-upload.js:652
+msgid "Could not create folder"
+msgstr "No se pudo crear el directorio"
+
+#: js/file-upload.js:702
+msgid "Error fetching URL"
+msgstr "Error al obtener la URL"
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr "Compartir"
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr "Borrar permanentemente"
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr "Cambiar nombre"
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr "Pendientes"
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr "No se pudo renombrar el archivo"
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr "se reemplazó {new_name} con {old_name}"
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr "deshacer"
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr "Error al borrar el archivo."
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n carpeta"
+msgstr[1] "%n carpetas"
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n archivo"
+msgstr[1] "%n archivos"
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr "{carpetas} y {archivos}"
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Subiendo %n archivo"
+msgstr[1] "Subiendo %n archivos"
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "El almacenamiento está lleno, los archivos no se pueden seguir actualizando ni sincronizando"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "El almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "La aplicación de encriptación está habilitada pero las llaves no fueron inicializadas, por favor termine y vuelva a iniciar la sesión"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "Llave privada inválida para la aplicación de encriptación. Por favor actualice la clave de la llave privada en las configuraciones personales para recobrar el acceso a sus archivos encriptados."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Tu descarga se está preparando. Esto puede demorar si los archivos son muy grandes."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
-msgstr ""
+msgstr "Error moviendo el archivo"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
 #: lib/app.php:60
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
-msgstr ""
+msgstr "Nombre de directorio inválido. 'Shared' está reservado."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "No se pudo renombrar %s"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Subir"
 
@@ -346,72 +353,68 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
-msgstr ""
+msgstr "Nuevo archivo de texto"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nueva Carpeta"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Archivos borrados"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "No tienes permisos para subir o crear archivos aquí"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada. ¡Subí contenido!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "El tamaño del archivo que querés subir es demasiado grande"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que intentás subir sobrepasan el tamaño máximo "
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor esperá."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Escaneo actual"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Actualizando el cache del sistema de archivos"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index cb3c9a08a0..ce96c6ce43 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # cjtess <claudio.tessone@gmail.com>, 2013
-# cnngimenez, 2013
+# cnngimenez, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -60,7 +60,7 @@ msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar."
 
 #: files/error.php:16
 #, php-format
@@ -68,46 +68,46 @@ msgid ""
 "Your private key is not valid! Likely your password was changed outside of "
 "%s (e.g. your corporate directory). You can update your private key password"
 " in your personal settings to recover access to your encrypted files."
-msgstr ""
+msgstr "¡Tu llave privada no es válida! Aparenta que tu clave fue cambiada fuera de %s (de tus directorios). Puedes actualizar la contraseña de tu clave privadaen las configuraciones personales para recobrar el acceso a tus archivos encriptados."
 
 #: files/error.php:19
 msgid ""
 "Can not decrypt this file, probably this is a shared file. Please ask the "
 "file owner to reshare the file with you."
-msgstr ""
+msgstr "No se puede descibrar este archivo, probablemente sea un archivo compartido. Por favor pídele al dueño que recomparta el archivo contigo."
 
 #: files/error.php:22 files/error.php:27
 msgid ""
 "Unknown error please check your system settings or contact your "
 "administrator"
-msgstr ""
+msgstr "Error desconocido, por favor chequea la configuración de tu sistema o contacte a su administrador"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Requisitos incompletos."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Los siguientes usuarios no fueron configurados para encriptar:"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "Encriptación inicial comenzada... Esto puede durar un tiempo. Por favor espere."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Guardando..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Ve directamente a tu"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
@@ -128,7 +128,7 @@ msgstr "Contraseña de recuperación de clave"
 
 #: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Repetir la contraseña de la clave de recuperación"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
@@ -152,7 +152,7 @@ msgstr "Nueva contraseña de recuperación de clave"
 
 #: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Repetir Nueva contraseña para la clave de recuperación"
 
 #: templates/settings-admin.php:58
 msgid "Change Password"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index acf6aafe87..5208f40205 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acceso permitido"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Error al configurar el almacenamiento de Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Permitir acceso"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Error al configurar el almacenamiento de Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Advertencia:</b> El cliente smb \"smbclient\" no está instalado. Montar archivos CIFS/SMB no es posible. Por favor, pedile al administrador de tu sistema que lo instale."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no está instalado. Montar archivos FTP no es posible. Por favor, pedile al administrador de tu sistema que lo instale."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Habilitar almacenamiento de usuario externo"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "certificados SSL raíz"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importar certificado raíz"
diff --git a/l10n/es_AR/files_sharing.po b/l10n/es_AR/files_sharing.po
index 7cf9250e1c..aed7ae395d 100644
--- a/l10n/es_AR/files_sharing.po
+++ b/l10n/es_AR/files_sharing.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # cjtess <claudio.tessone@gmail.com>, 2013
+# cnngimenez, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,9 +19,13 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Compartido por {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
-msgstr ""
+msgstr "Esto está protegido por contraseña"
 
 #: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
@@ -54,32 +59,16 @@ msgstr "compartir está desactivado"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mayor información, contactá a la persona que te mandó el enlace."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s compartió la carpeta %s con vos"
-
-#: templates/public.php:21
-#, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s compartió el archivo %s con vos"
-
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Descargar"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Subir"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Cancelar subida"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "La vista preliminar no está disponible para"
-
-#: templates/public.php:99
-msgid "Direct link"
+msgid "shared by %s"
 msgstr ""
+
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:48
+msgid "Direct link"
+msgstr "Vínculo directo"
diff --git a/l10n/es_AR/files_trashbin.po b/l10n/es_AR/files_trashbin.po
index 9ace7d23d4..4e361d2114 100644
--- a/l10n/es_AR/files_trashbin.po
+++ b/l10n/es_AR/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "No fue posible borrar %s de manera permanente"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "No se pudo restaurar %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Archivos borrados"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Error"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "recuperado"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "No hay nada acá. ¡La papelera está vacía!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Recuperar"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Borrado"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Archivos eliminados"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index 6fa78e41c1..338ad790c0 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # cjtess <claudio.tessone@gmail.com>, 2013
+# cnngimenez, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +19,38 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "La app \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud"
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "No fue especificado el nombre de la app"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Ayuda"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Configuración"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Usuarios"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administración"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "No se pudo actualizar \"%s\"."
@@ -62,15 +63,10 @@ msgstr "Tipo de archivo desconocido"
 msgid "Invalid image"
 msgstr "Imagen inválida"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "servicios web sobre los que tenés control"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "no se puede abrir \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
@@ -91,76 +87,80 @@ msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
-msgstr ""
+msgstr "Por favor, descargue estos archivos de forma separada en pequeñas partes o pídalo amablemente a su administrador."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "No se especificó el origen al instalar la app"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "No se especificó href al instalar la app"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "No se especificó PATH al instalar la app desde el archivo local"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "No hay soporte para archivos de tipo %s"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Error al abrir archivo mientras se instalaba la app"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "La app no suministra un archivo info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "No puede ser instalada la app por tener código no autorizado"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "No se puede instalar la app porque no es compatible con esta versión de ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "La app no se puede instalar porque contiene la etiqueta <shipped>true</shipped> que no está permitida para apps no distribuidas"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "El directorio de la app ya existe"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "No se puede crear el directorio para la app. Corregí los permisos. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "La aplicación no está habilitada"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Error al autenticar"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token expirado. Por favor, recargá la página."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Archivos"
@@ -200,8 +200,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Tenés que ingresar una cuenta existente o el administrador."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Usuario y/o contraseña MySQL no válido"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -228,21 +228,21 @@ msgstr "El comando no comprendido es: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Usuario MySQL '%s'@'localhost' ya existe."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Borrar este usuario de MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Usuario MySQL '%s'@'%%' ya existe"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Borrar este usuario de MySQL"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -269,66 +269,72 @@ msgstr "Configurar un nombre de administrador."
 msgid "Set an admin password."
 msgstr "Configurar una contraseña de administrador."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s compartió \"%s\" con vos"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "No fue posible encontrar la categoría \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "hoy"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ayer"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "el mes pasado"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "el año pasado"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "años atrás"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index b7a8c51dea..206cfbe5cf 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -5,14 +5,14 @@
 # Translators:
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013
 # cjtess <claudio.tessone@gmail.com>, 2013
-# cnngimenez, 2013
+# cnngimenez, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,48 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "e-mail mandado"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Encriptación"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Imposible cargar la lista desde el App Store"
@@ -31,11 +73,11 @@ msgstr "Error al autenticar"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
-msgstr ""
+msgstr "Su nombre completo ha sido cambiado."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change full name"
-msgstr ""
+msgstr "Imposible cambiar el nombre completo"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -89,89 +131,117 @@ msgstr "No se pudo actualizar la App."
 
 #: changepassword/controller.php:20
 msgid "Wrong password"
-msgstr ""
+msgstr "Clave incorrecta"
 
 #: changepassword/controller.php:42
 msgid "No user supplied"
-msgstr ""
+msgstr "No se ha indicado el usuario"
 
 #: changepassword/controller.php:74
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr ""
+msgstr "Por favor provea de una contraseña de recuperación administrativa, sino se perderá todos los datos del usuario"
 
 #: changepassword/controller.php:79
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
-msgstr ""
+msgstr "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo"
 
 #: changepassword/controller.php:87
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
-msgstr ""
+msgstr "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente."
 
 #: changepassword/controller.php:92 changepassword/controller.php:103
 msgid "Unable to change password"
+msgstr "Imposible cambiar la contraseña"
+
+#: js/admin.js:73
+msgid "Sending..."
 msgstr ""
 
-#: js/apps.js:43
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Documentación de Usuario"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Actualizar a {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Activar"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Por favor, esperá...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Se ha producido un error mientras se deshabilitaba la aplicación"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Se ha producido un error mientras se habilitaba la aplicación"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Actualizando...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Error al actualizar App"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Actualizar"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
+msgstr "Seleccionar una imágen de perfil"
+
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:266
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Desencriptando archivos... Por favor espere, esto puede tardar."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Guardando..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "borrado"
@@ -184,75 +254,99 @@ msgstr "deshacer"
 msgid "Unable to remove user"
 msgstr "Imposible borrar usuario"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Borrar"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "agregar grupo"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Debe ingresar un nombre de usuario válido"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Error creando usuario"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Debe ingresar una contraseña válida"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
-msgstr ""
+msgstr "Advertencia: El directorio Home del usuario \"{user}\" ya existe"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
 #: templates/admin.php:8
 msgid "Everything (fatal issues, errors, warnings, info, debug)"
-msgstr ""
+msgstr "Todo (notificaciones fatales, errores, advertencias, info, debug)"
 
 #: templates/admin.php:9
 msgid "Info, warnings, errors and fatal issues"
-msgstr ""
+msgstr "Info, advertencias, errores y notificaciones fatales"
 
 #: templates/admin.php:10
 msgid "Warnings, errors and fatal issues"
-msgstr ""
+msgstr "Advertencias, errores y notificaciones fatales"
 
 #: templates/admin.php:11
 msgid "Errors and fatal issues"
-msgstr ""
+msgstr "Errores y notificaciones fatales"
 
 #: templates/admin.php:12
 msgid "Fatal issues only"
+msgstr "Notificaciones fatales solamente"
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ninguno"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Ingresar"
+
+#: templates/admin.php:18
+msgid "Plain"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:25
+#: 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 ""
+msgstr "Está accediendo %s vía HTTP. Se sugiere fuertemente que configure su servidor para requerir el uso de HTTPS en vez del otro."
 
-#: templates/admin.php:39
+#: 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 "
@@ -261,68 +355,68 @@ msgid ""
 "root."
 msgstr "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Alerta de Configuración"
 
-#: templates/admin.php:53
+#: 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 "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Por favor, cheque bien la <a href=\"%s\">guía de instalación</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "El módulo 'fileinfo' no existe"
 
-#: templates/admin.php:68
+#: 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 "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type"
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
-msgstr ""
+msgstr "Su versión de PHP está fuera de término"
 
-#: templates/admin.php:82
+#: 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 ""
+msgstr "Su versión de PHP está fuera de término. Recomendamos fuertemente actualizar a 5.3.8 o a una más nueva porque se sabe que versiones anteriores están falladas. Es posible que esta instalación no funcione adecuadamente."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "\"Locale\" no está funcionando"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
-msgstr ""
+msgstr "La localización del sistema no puede cambiarse a una que soporta UTF-8"
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
-msgstr ""
+msgstr "Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos."
 
-#: templates/admin.php:106
+#: 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 ""
+msgstr "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "La conexión a Internet no esta funcionando. "
 
-#: templates/admin.php:121
+#: 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 "
@@ -331,118 +425,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Ejecutá una tarea con cada pagina cargada."
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
-msgstr ""
+msgstr "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr ""
+msgstr "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Habilitar Share API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones usar la Share API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir enlaces públicos"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir que los usuarios autoricen a otros a subir archivos en sus directorios públicos compartidos"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir Re-Compartir"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Permite a los usuarios volver a compartir items que les fueron compartidos"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquiera."
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sólo con los de sus mismos grupos"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
-msgstr ""
+msgstr "Permitir notificaciones por correo"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Permitir al usuario enviar notificaciones por correo para archivos compartidos"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL"
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Dirección del servidor"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Puerto"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Credenciales"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivel de Log"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -452,30 +606,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Añadí tu App"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Más Apps"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Elegí una App"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Mirá la web de aplicaciones apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\">"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Documentación de Usuario"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentación de Administrador"
@@ -509,7 +667,7 @@ msgstr "Mostrar de nuevo el asistente de primera ejecución"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Usás <strong>%s</strong>  de los <strong>%s</strong> disponibles"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contraseña"
 
@@ -521,151 +679,149 @@ msgstr "Tu contraseña fue cambiada"
 msgid "Unable to change your password"
 msgstr "No fue posible cambiar tu contraseña"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nueva contraseña:"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
-msgstr ""
+msgstr "Nombre completo"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "e-mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Tu dirección de e-mail"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Escribí una dirección de e-mail para restablecer la contraseña"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
-msgstr ""
-
-#: templates/personal.php:91
-msgid "Upload new"
-msgstr ""
-
-#: templates/personal.php:93
-msgid "Select new from Files"
-msgstr ""
-
-#: templates/personal.php:94
-msgid "Remove image"
-msgstr ""
-
-#: templates/personal.php:95
-msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
-
-#: templates/personal.php:97
-msgid "Your avatar is provided by your original account."
-msgstr ""
+msgstr "Imágen de perfil"
 
 #: templates/personal.php:101
-msgid "Abort"
-msgstr "Abortar"
+msgid "Upload new"
+msgstr "Subir nuevo"
 
-#: templates/personal.php:102
+#: templates/personal.php:103
+msgid "Select new from Files"
+msgstr "Seleccionar nuevo desde archivos"
+
+#: templates/personal.php:104
+msgid "Remove image"
+msgstr "Remover imagen"
+
+#: templates/personal.php:105
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Sólo png o jpg. Lo ideal que sea cuadrada sino luego podrás recortarlo."
+
+#: templates/personal.php:107
+msgid "Your avatar is provided by your original account."
+msgstr "Su avatar es proveído por su cuenta original."
+
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: templates/personal.php:112
 msgid "Choose as profile image"
-msgstr ""
+msgstr "Elegir como imagen de perfil"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Ayudanos a traducir"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
-msgstr ""
+msgstr "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Encriptación"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr ""
+msgstr "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos."
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Clave de acceso"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Desencriptar todos los archivos"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Nombre de Usuario"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Recuperación de contraseña de administrador"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Almacenamiento Predeterminado"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
-msgstr ""
+msgstr "Por favor ingrese la cuota de almacenamiento (ej.: \"512 MB\" o \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Otros"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
-msgstr ""
+msgstr "Cambiar nombre completo"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "Configurar nueva contraseña"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 4588bc43a2..bbccd0908e 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # cjtess <claudio.tessone@gmail.com>, 2013
+# cnngimenez, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,24 +41,24 @@ msgstr "La configuración es válida, pero el enlace falló. Por favor, comprob
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
-msgstr ""
+msgstr "La configuración es inválida. Por favor, verifique los logs para más detalles."
 
 #: ajax/wizard.php:32
 msgid "No action specified"
-msgstr ""
+msgstr "No se ha especificado una acción"
 
 #: ajax/wizard.php:38
 msgid "No configuration specified"
-msgstr ""
+msgstr "No se ha especificado una configuración"
 
 #: ajax/wizard.php:81
 msgid "No data specified"
-msgstr ""
+msgstr "No se ha especificado datos"
 
 #: ajax/wizard.php:89
 #, php-format
 msgid " Could not set configuration %s"
-msgstr ""
+msgstr "No se pudo asignar la configuración %s"
 
 #: js/settings.js:67
 msgid "Deletion failed"
@@ -87,43 +88,43 @@ msgstr "Éxito"
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
-msgstr ""
+msgstr "Configuración válida"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
-msgstr ""
+msgstr "Configuración incorrecta"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
-msgstr ""
+msgstr "Configuración incompleta"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Seleccionar grupos"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
-msgstr ""
+msgstr "Seleccionar las clases de objetos"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
-msgstr ""
+msgstr "Seleccionar atributos"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "El este de conexión ha sido completado satisfactoriamente"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Falló es test de conexión"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "¿Realmente desea borrar la configuración actual del servidor?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Confirmar borrado"
 
@@ -131,23 +132,23 @@ msgstr "Confirmar borrado"
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s grupo encontrado"
+msgstr[1] "%s grupos encontrados"
 
 #: lib/wizard.php:122
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s usuario encontrado"
+msgstr[1] "%s usuarios encontrados"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
-msgstr ""
+msgstr "Host inválido"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
-msgstr ""
+msgstr "No se pudo encontrar la característica deseada"
 
 #: templates/part.settingcontrols.php:2
 msgid "Save"
@@ -163,56 +164,56 @@ msgstr "Ayuda"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
 msgid "only those object classes:"
-msgstr ""
+msgstr "solo estos objetos de clases:"
 
 #: templates/part.wizard-groupfilter.php:17
 #: templates/part.wizard-userfilter.php:17
 msgid "only from those groups:"
-msgstr ""
+msgstr "solo provenientes de estos grupos:"
 
 #: templates/part.wizard-groupfilter.php:25
 #: templates/part.wizard-loginfilter.php:32
 #: templates/part.wizard-userfilter.php:25
 msgid "Edit raw filter instead"
-msgstr ""
+msgstr "Editar filtro en bruto"
 
 #: templates/part.wizard-groupfilter.php:30
 #: templates/part.wizard-loginfilter.php:37
 #: templates/part.wizard-userfilter.php:30
 msgid "Raw LDAP filter"
-msgstr ""
+msgstr "Filtro LDAP en bruto"
 
 #: templates/part.wizard-groupfilter.php:31
 #, php-format
 msgid ""
 "The filter specifies which LDAP groups shall have access to the %s instance."
-msgstr ""
+msgstr "El filtro especifica qué grupos LDAP deben tener acceso a la instancia %s."
 
 #: templates/part.wizard-groupfilter.php:38
 msgid "groups found"
-msgstr ""
+msgstr "grupos encontrados"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
-msgstr ""
+msgstr "Nombre de usuario LDAP:"
 
 #: templates/part.wizard-loginfilter.php:16
 msgid "LDAP Email Address:"
-msgstr ""
+msgstr "Correo electrónico LDAP:"
 
 #: templates/part.wizard-loginfilter.php:24
 msgid "Other Attributes:"
-msgstr ""
+msgstr "Otros atributos:"
 
 #: templates/part.wizard-loginfilter.php:38
 #, php-format
@@ -267,18 +268,18 @@ msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Av
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
 msgid ""
 "The filter specifies which LDAP users shall have access to the %s instance."
-msgstr ""
+msgstr "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s."
 
 #: templates/part.wizard-userfilter.php:38
 msgid "users found"
-msgstr ""
+msgstr "usuarios encontrados"
 
 #: templates/part.wizardcontrols.php:5
 msgid "Back"
@@ -286,7 +287,7 @@ msgstr "Volver"
 
 #: templates/part.wizardcontrols.php:8
 msgid "Continue"
-msgstr ""
+msgstr "Continuar"
 
 #: templates/settings.php:11
 msgid ""
@@ -410,41 +411,51 @@ msgstr "Atributos de búsqueda de grupo"
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Atributos Especiales"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Campo de cuota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Campo de e-mail"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Regla de nombre de los directorios de usuario"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Nombre interno de usuario"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento  por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados)."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atributo Nombre Interno de usuario:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Sobrescribir la detección UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados)."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Atributo UUID para usuarios:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Atributo UUID para grupos:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
diff --git a/l10n/es_CL/core.po b/l10n/es_CL/core.po
index 05b6eb1d9e..e028df6bb6 100644
--- a/l10n/es_CL/core.po
+++ b/l10n/es_CL/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# eganya <EGANYA@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +18,11 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,141 +59,145 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
-msgid "Sunday"
-msgstr ""
-
-#: js/config.php:33
-msgid "Monday"
-msgstr ""
-
-#: js/config.php:34
-msgid "Tuesday"
-msgstr ""
-
-#: js/config.php:35
-msgid "Wednesday"
-msgstr ""
-
 #: js/config.php:36
-msgid "Thursday"
-msgstr ""
+msgid "Sunday"
+msgstr "Domingo"
 
 #: js/config.php:37
-msgid "Friday"
-msgstr ""
+msgid "Monday"
+msgstr "Lunes"
 
 #: js/config.php:38
+msgid "Tuesday"
+msgstr "Martes"
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr "Jueves"
+
+#: js/config.php:41
+msgid "Friday"
+msgstr "Viernes"
+
+#: js/config.php:42
 msgid "Saturday"
-msgstr ""
-
-#: js/config.php:43
-msgid "January"
-msgstr ""
-
-#: js/config.php:44
-msgid "February"
-msgstr ""
-
-#: js/config.php:45
-msgid "March"
-msgstr ""
-
-#: js/config.php:46
-msgid "April"
-msgstr ""
+msgstr "Sábado"
 
 #: js/config.php:47
-msgid "May"
-msgstr ""
+msgid "January"
+msgstr "Enero"
 
 #: js/config.php:48
-msgid "June"
-msgstr ""
+msgid "February"
+msgstr "Febrero"
 
 #: js/config.php:49
-msgid "July"
-msgstr ""
+msgid "March"
+msgstr "Marzo"
 
 #: js/config.php:50
-msgid "August"
-msgstr ""
+msgid "April"
+msgstr "Abril"
 
 #: js/config.php:51
-msgid "September"
-msgstr ""
+msgid "May"
+msgstr "Mayo"
 
 #: js/config.php:52
-msgid "October"
-msgstr ""
+msgid "June"
+msgstr "Junio"
 
 #: js/config.php:53
-msgid "November"
-msgstr ""
+msgid "July"
+msgstr "Julio"
 
 #: js/config.php:54
-msgid "December"
-msgstr ""
+msgid "August"
+msgstr "Agosto"
 
-#: js/js.js:398
+#: js/config.php:55
+msgid "September"
+msgstr "Septiembre"
+
+#: js/config.php:56
+msgid "October"
+msgstr "Octubre"
+
+#: js/config.php:57
+msgid "November"
+msgstr "Noviembre"
+
+#: js/config.php:58
+msgid "December"
+msgstr "Diciembre"
+
+#: js/js.js:458
 msgid "Settings"
 msgstr "Configuración"
 
-#: js/js.js:869
-msgid "seconds ago"
+#: js/js.js:496
+msgid "Saving..."
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:995
+msgid "seconds ago"
+msgstr "segundos antes"
+
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
-msgstr ""
+msgstr "hoy"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
-msgstr ""
+msgstr "ayer"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
-msgstr ""
+msgstr "mes anterior"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
-msgstr ""
+msgstr "meses antes"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
-msgstr ""
+msgstr "último año"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
-msgstr ""
+msgstr "años anteriores"
 
 #: js/oc-dialogs.js:123
 msgid "Choose"
-msgstr ""
+msgstr "Choose"
 
 #: js/oc-dialogs.js:146
 msgid "Error loading file picker template: {error}"
@@ -214,15 +205,15 @@ msgstr ""
 
 #: js/oc-dialogs.js:172
 msgid "Yes"
-msgstr ""
+msgstr "Si"
 
 #: js/oc-dialogs.js:182
 msgid "No"
-msgstr ""
+msgstr "No"
 
 #: js/oc-dialogs.js:199
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
 #: js/oc-dialogs.js:219
 msgid "Error loading message template: {error}"
@@ -250,7 +241,7 @@ msgstr ""
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
-msgstr ""
+msgstr "Cancelar"
 
 #: js/oc-dialogs.js:386
 msgid "Continue"
@@ -268,154 +259,174 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
-msgstr ""
+msgstr "Compartido"
 
 #: js/share.js:109
 msgid "Share"
-msgstr ""
+msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
-msgstr ""
+msgstr "Ocurrió un error mientras compartía"
 
 #: js/share.js:171
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Ocurrió un error mientras dejaba de compartir"
 
 #: js/share.js:178
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Ocurrió un error mientras se cambiaban los permisos"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Clave"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
 #: js/tags.js:4
 msgid "The object type is not specified."
-msgstr ""
+msgstr "El tipo de objeto no está especificado."
 
 #: js/tags.js:13
 msgid "Enter new"
@@ -456,11 +467,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +497,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Usuario"
 
@@ -517,6 +534,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +554,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +664,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +720,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +746,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/es_CL/files.po b/l10n/es_CL/files.po
index 2bb37f65f4..f84895926b 100644
--- a/l10n/es_CL/files.po
+++ b/l10n/es_CL/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Archivos"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
-msgstr ""
+msgstr "Compartir"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Subir"
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
-msgstr ""
+msgstr "Descargar"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/es_CL/files_encryption.po b/l10n/es_CL/files_encryption.po
index 27a1d9e6e5..cd2c88e3ae 100644
--- a/l10n/es_CL/files_encryption.po
+++ b/l10n/es_CL/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-16 14:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:278
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/es_CL/files_external.po b/l10n/es_CL/files_external.po
index 9537ed2468..53d85c6613 100644
--- a/l10n/es_CL/files_external.po
+++ b/l10n/es_CL/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-16 14:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:467
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:471
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:474
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/es_CL/files_sharing.po b/l10n/es_CL/files_sharing.po
index a4836e6eea..90d1afb2ff 100644
--- a/l10n/es_CL/files_sharing.po
+++ b/l10n/es_CL/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 16:42-0500\n"
-"PO-Revision-Date: 2013-12-17 15:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Subir"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/es_CL/files_trashbin.po b/l10n/es_CL/files_trashbin.po
index 1e0643be9b..e7ad1c4cb6 100644
--- a/l10n/es_CL/files_trashbin.po
+++ b/l10n/es_CL/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-16 14:34+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,21 +17,25 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
-msgid "Error"
+#: js/filelist.js:23
+msgid "Deleted files"
 msgstr ""
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+msgid "Error"
+msgstr "Error"
+
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/es_CL/lib.po b/l10n/es_CL/lib.po
index a6cad8d93c..30b584c236 100644
--- a/l10n/es_CL/lib.po
+++ b/l10n/es_CL/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Configuración"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Archivos"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
-msgstr ""
+msgstr "segundos antes"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
-msgid "today"
-msgstr ""
-
-#: private/template/functions.php:134
-msgid "yesterday"
-msgstr ""
-
 #: private/template/functions.php:136
+msgid "today"
+msgstr "hoy"
+
+#: private/template/functions.php:137
+msgid "yesterday"
+msgstr "ayer"
+
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
-msgstr ""
+msgstr "mes anterior"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
-msgstr ""
+msgstr "último año"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
-msgstr ""
+msgstr "años anteriores"
diff --git a/l10n/es_CL/settings.po b/l10n/es_CL/settings.po
index 75d4de7ece..602def0e1e 100644
--- a/l10n/es_CL/settings.po
+++ b/l10n/es_CL/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 16:42-0500\n"
-"PO-Revision-Date: 2013-12-17 15:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Clave"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Usuario"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/es_CL/user_ldap.po b/l10n/es_CL/user_ldap.po
index d7d1525094..5a138f0da1 100644
--- a/l10n/es_CL/user_ldap.po
+++ b/l10n/es_CL/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 16:42-0500\n"
-"PO-Revision-Date: 2013-12-17 15:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/owncloud/language/es_CL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,45 +84,45 @@ msgstr ""
 
 #: js/settings.js:133
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/es_MX/core.po b/l10n/es_MX/core.po
index 978e2ba5a4..7486794d9d 100644
--- a/l10n/es_MX/core.po
+++ b/l10n/es_MX/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-02 01:55-0500\n"
-"PO-Revision-Date: 2014-01-02 01:23+0000\n"
-"Last-Translator: byoship\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s ha compartido  »%s« contigo"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "No se pudo enviar el mensaje a los siguientes usuarios: %s"
@@ -39,19 +38,6 @@ msgstr "Modo mantenimiento desactivado"
 msgid "Updated database"
 msgstr "Base de datos actualizada"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Actualizando caché de archivos, esto puede tardar bastante tiempo..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Caché de archivos actualizada"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% hecho ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "No se especificó ningún archivo o imagen"
@@ -72,135 +58,139 @@ msgstr "No hay disponible una imagen temporal de perfil, pruebe de nuevo"
 msgid "No crop data provided"
 msgstr "No se proporcionó datos del recorte"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Lunes"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Martes"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Jueves"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Viernes"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Enero"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Febrero"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mayo"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Septiembre"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Octubre"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Noviembre"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Diciembre"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Guardando..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "segundos antes"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "meses antes"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "el año pasado"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "años antes"
 
@@ -268,6 +258,26 @@ msgstr "({count} seleccionados)"
 msgid "Error loading file exists template"
 msgstr "Error cargando plantilla de archivo existente"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Compartido"
@@ -276,12 +286,12 @@ msgstr "Compartido"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -293,123 +303,123 @@ msgstr "Error al dejar de compartir"
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permisos"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido contigo y el grupo {group} por {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Compartido contigo por {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Compartido con el usuario o con el grupo …"
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Enlace compartido"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Protección con contraseña"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Contraseña"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Permitir Subida Pública"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Enviar enlace por correo electrónico a una persona"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Compartir por correo electrónico:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "No se encontró gente"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "notificar al usuario por correo electrónico"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protegido con contraseña"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Error eliminando fecha de caducidad"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Correo electrónico enviado"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Precaución"
 
@@ -456,11 +466,17 @@ msgstr "La actualización ha fracasado. Por favor, informe de este problema a la
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s restablecer contraseña"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Utilice el siguiente enlace para restablecer su contraseña: {link}"
@@ -480,8 +496,8 @@ msgstr "La petición ha fallado! <br> ¿Está seguro de que su dirección de cor
 msgid "You will receive a link to reset your password via Email."
 msgstr "Recibirá un enlace por correo electrónico para restablecer su contraseña"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nombre de usuario"
 
@@ -517,6 +533,18 @@ msgstr "Nueva contraseña"
 msgid "Reset password"
 msgstr "Restablecer contraseña"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -525,7 +553,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usuarios"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplicaciones"
 
@@ -635,49 +663,47 @@ msgstr "Para información de cómo configurar apropiadamente su servidor, por fa
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avanzado"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Directorio de datos"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "se utilizarán"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Finalizando …"
 
@@ -693,7 +719,7 @@ msgstr "Esta aplicación requiere que se habilite JavaScript para su correcta op
 msgid "%s is available. Get more information on how to update."
 msgstr "%s esta disponible. Obtener mas información de como actualizar."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Salir"
 
@@ -719,28 +745,28 @@ msgstr "La autenticación a fallado en el servidor."
 msgid "Please contact your administrator."
 msgstr "Por favor, contacte con el administrador."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "¿Ha perdido su contraseña?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "recordar"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Accesos Alternativos"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hola:<br><br>tan solo queremos informarte que %s compartió «%s» contigo.<br><a href=\"%s\">¡Míralo acá!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/es_MX/files.po b/l10n/es_MX/files.po
index 3ab8a00fc9..e35ebde5b1 100644
--- a/l10n/es_MX/files.po
+++ b/l10n/es_MX/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-02 01:55-0500\n"
-"PO-Revision-Date: 2014-01-02 01:10+0000\n"
-"Last-Translator: byoship\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "No se pudo mover %s - Ya existe un archivo con ese nombre."
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "No se pudo mover %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "El nombre de archivo no puede estar vacío."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "El nombre del archivo, NO puede contener el simbolo\"/\", por favor elija un nombre diferente."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "El nombre %s ya está en uso por la carpeta %s. Por favor elija uno diferente."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "No es un origen válido"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "El servidor no puede acceder URLs; revise la configuración del servidor."
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Error mientras se descargaba %s a %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Error al crear el archivo"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "El nombre de la carpeta no puede estar vacío."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "El nombre de la carpeta, NO puede contener el simbolo\"/\", por favor elija un nombre diferente."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Error al crear la carpeta."
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Incapaz de crear directorio de subida."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Token Inválido"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "No se subió ningún archivo. Error desconocido"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "No hubo ningún problema, el archivo se subió con éxito"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "El archivo subido sobrepasa la directiva 'upload_max_filesize' en php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo subido sobrepasa la directiva 'MAX_FILE_SIZE' especificada en el formulario HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo subido fue sólo subido parcialmente"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "No se subió ningún archivo"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Falta la carpeta temporal"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Falló al escribir al disco"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "No hay suficiente espacio disponible"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Actualización fallida. No se pudo obtener información del archivo."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Actualización fallida. No se pudo encontrar el archivo subido"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Actualización fallida. No se pudo obtener información del archivo."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Directorio inválido."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Archivos"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "No se pudo obtener respuesta del servidor."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "La dirección URL no puede estar vacía"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "En la carpeta de inicio, 'Shared' es un nombre reservado"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "No se pudo crear el archivo"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "No se pudo crear la carpeta"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Error al descargar URL."
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Error borrando el archivo."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n carpeta"
 msgstr[1] "%n carpetas"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n archivo"
 msgstr[1] "%n archivos"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} y {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Subiendo %n archivo"
 msgstr[1] "Subiendo %n archivos"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' no es un nombre de archivo válido."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos "
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Su almacenamiento está lleno, ¡los archivos no se actualizarán ni sincronizarán más!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Su almacenamiento está casi lleno ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "La aplicación de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "La clave privada no es válida para la aplicación de cifrado. Por favor, actualiza la contraseña de tu clave privada en tus ajustes personales para recuperar el acceso a tus archivos cifrados."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Su descarga está siendo preparada. Esto podría tardar algo de tiempo si los archivos son grandes."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Error moviendo archivo"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
@@ -301,12 +308,12 @@ msgstr "Modificado"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nombre de carpeta inválido. El uso de \"Shared\" esta reservado."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s no pudo ser renombrado"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Subir"
 
@@ -342,72 +349,68 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nuevo"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Nuevo archivo de texto"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Archivo de texto"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Carpeta"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Archivos eliminados"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "No tienes permisos para subir o crear archivos aquí."
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada aquí. ¡Suba algo!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Subida demasido grande"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido en este servidor."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Los archivos están siendo escaneados,  por favor espere."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Escaneo actual"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Actualizando caché del sistema de archivos..."
diff --git a/l10n/es_MX/files_encryption.po b/l10n/es_MX/files_encryption.po
index 568f9b2783..50a52b5503 100644
--- a/l10n/es_MX/files_encryption.po
+++ b/l10n/es_MX/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-02 01:55-0500\n"
-"PO-Revision-Date: 2013-12-31 19:30+0000\n"
-"Last-Translator: byoship\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"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr "Error desconocido. Verifique la configuración de su sistema o póngase en contacto con su administrador"
 
-#: hooks/hooks.php:62
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Requisitos incompletos."
 
-#: hooks/hooks.php:63
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada."
 
-#: hooks/hooks.php:281
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
 
@@ -99,9 +99,9 @@ msgstr "Los siguientes usuarios no han sido configurados para el cifrado:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Guardando..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/es_MX/files_external.po b/l10n/es_MX/files_external.po
index 1f535c50fd..bc01ae7106 100644
--- a/l10n/es_MX/files_external.po
+++ b/l10n/es_MX/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-02 01:55-0500\n"
-"PO-Revision-Date: 2013-12-31 19:50+0000\n"
-"Last-Translator: byoship\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"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acceso concedido"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Error configurando el almacenamiento de Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Conceder acceso"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Error configurando el almacenamiento de Google Drive"
 
-#: lib/config.php:467
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Advertencia:</b> El cliente \"smbclient\" no se encuentra instalado. El montado de carpetas CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale."
 
-#: lib/config.php:471
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de carpetas FTP no es posible. Por favor pida al administrador de su sistema que lo instale."
 
-#: lib/config.php:474
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Habilitar almacenamiento externo de usuario"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Certificados raíz SSL"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importar certificado raíz"
diff --git a/l10n/es_MX/files_sharing.po b/l10n/es_MX/files_sharing.po
index 610c125b72..f4faa22eba 100644
--- a/l10n/es_MX/files_sharing.po
+++ b/l10n/es_MX/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-02 01:55-0500\n"
-"PO-Revision-Date: 2014-01-02 01:10+0000\n"
-"Last-Translator: byoship\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"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Compartido por {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Este elemento compartido esta protegido por contraseña"
@@ -53,32 +57,16 @@ msgstr "compartir está desactivado"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mayor información, contacte a la persona que le envió el enlace."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s compartió la carpeta %s contigo"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s compartió el archivo %s contigo"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Descargar"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Subir"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Cancelar subida"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "No hay vista previa disponible para"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Enlace directo"
diff --git a/l10n/es_MX/files_trashbin.po b/l10n/es_MX/files_trashbin.po
index 7a4bf2cfd7..d55838ac0b 100644
--- a/l10n/es_MX/files_trashbin.po
+++ b/l10n/es_MX/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-02 01:55-0500\n"
-"PO-Revision-Date: 2013-12-31 19:50+0000\n"
-"Last-Translator: byoship\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"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,21 +17,25 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "No se puede eliminar %s permanentemente"
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "No se puede restaurar %s"
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Archivos eliminados"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Error"
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "recuperado"
 
diff --git a/l10n/es_MX/lib.po b/l10n/es_MX/lib.po
index e47ddeeee9..239fda1a7e 100644
--- a/l10n/es_MX/lib.po
+++ b/l10n/es_MX/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-02 01:55-0500\n"
-"PO-Revision-Date: 2014-01-02 00:20+0000\n"
-"Last-Translator: byoship\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"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,34 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:245
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "La aplicación \"%s\" no puede ser instalada porque no es compatible con esta versión de ownCloud"
 
-#: private/app.php:257
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "No se ha especificado nombre de la aplicación"
 
-#: private/app.php:362
+#: private/app.php:353
 msgid "Help"
 msgstr "Ayuda"
 
-#: private/app.php:375
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:386
+#: private/app.php:377
 msgid "Settings"
 msgstr "Ajustes"
 
-#: private/app.php:398
+#: private/app.php:389
 msgid "Users"
 msgstr "Usuarios"
 
-#: private/app.php:411
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administración"
 
@@ -61,15 +61,10 @@ msgstr "Tipo de archivo desconocido"
 msgid "Invalid image"
 msgstr "Imagen inválida"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Servicios web bajo su control"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "No se puede abrir \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente a su administrador."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "No se ha especificado origen cuando se ha instalado la aplicación"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "No href especificado cuando se ha instalado la aplicación"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Sin path especificado cuando se ha instalado la aplicación desde el archivo local"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Archivos de tipo %s no son soportados"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Fallo de abrir archivo mientras se instala la aplicación"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "La aplicación no suministra un archivo info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "La aplicación no puede ser instalada por tener código no autorizado en la aplicación"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "El directorio de la aplicación ya existe"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "La aplicación no está habilitada"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Error de autenticación"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token expirado. Por favor, recarga la página."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Archivos"
@@ -199,8 +198,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Tiene que ingresar una cuenta existente o la del administrador."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Usuario y/o contraseña de MySQL no válidos"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -227,21 +226,21 @@ msgstr "Comando infractor: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Usuario MySQL '%s'@'localhost' ya existe."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Eliminar este usuario de MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Usuario MySQL '%s'@'%%' ya existe"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Eliminar este usuario de MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -268,66 +267,72 @@ msgstr "Configurar un nombre de usuario del administrador"
 msgid "Set an admin password."
 msgstr "Configurar la contraseña del administrador."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s ha compartido  »%s« contigo"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "No puede encontrar la categoria \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Hace %n minuto"
 msgstr[1] "Hace %n minutos"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Hace %n hora"
 msgstr[1] "Hace %n horas"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "hoy"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ayer"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "Hace %n día"
 msgstr[1] "Hace %n días"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "mes pasado"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Hace %n mes"
 msgstr[1] "Hace %n meses"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "año pasado"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "hace años"
diff --git a/l10n/es_MX/settings.po b/l10n/es_MX/settings.po
index 62fafbc21c..29badc9fef 100644
--- a/l10n/es_MX/settings.po
+++ b/l10n/es_MX/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-02 01:55-0500\n"
-"PO-Revision-Date: 2014-01-02 01:42+0000\n"
-"Last-Translator: byoship\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Correo electrónico enviado"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "No se pudo cargar la lista desde el App Store"
@@ -113,62 +155,90 @@ msgstr "El back-end no soporta cambios de contraseña, pero la clave de cifrado
 msgid "Unable to change password"
 msgstr "No se ha podido cambiar la contraseña"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Documentación de usuario"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Actualizado a {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Activar"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Espere, por favor...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Error mientras se desactivaba la aplicación"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Error mientras se activaba la aplicación"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Actualizando...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Error mientras se actualizaba la aplicación"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Actualizar"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Seleccionar una imagen de perfil"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Guardando..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "eliminado"
@@ -181,40 +251,40 @@ msgstr "deshacer"
 msgid "Unable to remove user"
 msgstr "Imposible eliminar al usuario"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Administrador del Grupo"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "añadir Grupo"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Se debe proporcionar un nombre de usuario válido"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Error al crear usuario"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Se debe proporcionar una contraseña válida"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Atención: el directorio de inicio para el usuario \"{user}\" ya existe."
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Español (México)"
 
@@ -238,18 +308,42 @@ msgstr "Errores y problemas fatales"
 msgid "Fatal issues only"
 msgstr "Problemas fatales solamente"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Iniciar sesión"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:25
+#: 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 "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS."
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Advertencia de configuración"
 
-#: templates/admin.php:53
+#: 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 "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "No se ha encontrado el módulo \"fileinfo\""
 
-#: templates/admin.php:68
+#: 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 "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Su versión de PHP ha caducado"
 
-#: templates/admin.php:82
+#: 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 "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "La configuración regional no está funcionando"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "No se puede escoger una configuración regional que soporte UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos."
 
-#: templates/admin.php:106
+#: 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 "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. "
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "La conexión a Internet no está funcionando"
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Ejecutar una tarea con cada página cargada"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Utiliza el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartiendo"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activar API de Compartición"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones utilizar la API de Compartición"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir elementos con el público mediante enlaces"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir subidas públicas"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir a los usuarios habilitar a otros para subir archivos en sus carpetas compartidas públicamente"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir re-compartición"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir a los usuarios compartir de nuevo elementos ya compartidos"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquier persona"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir sólo con los usuarios en sus grupos"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir notificaciones por correo electrónico"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Permitir al usuario enviar notificaciones por correo electrónico de archivos compartidos"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Seguridad"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Dirección del servidor"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Puerto"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Más"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +603,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Añade tu aplicación"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Más aplicaciones"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Seleccionar una aplicación"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver la página de aplicaciones en apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Documentación de usuario"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentación de administrador"
@@ -506,7 +664,7 @@ msgstr "Mostrar nuevamente el Asistente de ejecución inicial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contraseña"
 
@@ -518,151 +676,149 @@ msgstr "Su contraseña ha sido cambiada"
 msgid "Unable to change your password"
 msgstr "No se ha podido cambiar su contraseña"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Nombre completo"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Su dirección de correo"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Escriba una dirección de correo electrónico para restablecer la contraseña"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Foto de perfil"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Subir otra"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Seleccionar otra desde Archivos"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Borrar imagen"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Su avatar es proporcionado por su cuenta original."
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Seleccionar como imagen de perfil"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Ayúdanos a traducir"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Cifrado"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "La aplicación de cifrado ya no está activada, descifre todos sus archivos"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Contraseña de acceso"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Descifrar archivos"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Nombre de usuario"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Recuperación de la contraseña de administración"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña."
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Almacenamiento predeterminado"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nombre de usuario"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "cambiar el nombre completo"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "establecer nueva contraseña"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/es_MX/user_ldap.po b/l10n/es_MX/user_ldap.po
index 4a5d82737a..78711d7f98 100644
--- a/l10n/es_MX/user_ldap.po
+++ b/l10n/es_MX/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-02 01:55-0500\n"
-"PO-Revision-Date: 2013-12-31 19:50+0000\n"
-"Last-Translator: byoship\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/owncloud/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "Éxito"
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Configuración OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Configuración Incorrecta"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Configuración incompleta"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Seleccionar grupos"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Seleccionar la clase de objeto"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Seleccionar atributos"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "La prueba de conexión fue exitosa"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "La prueba de conexión falló"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "¿Realmente desea eliminar la configuración actual del servidor?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Confirmar eliminación"
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] "Usuario %s encontrado"
 msgstr[1] "Usuarios %s encontrados"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Host inválido"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "No se puede encontrar la función deseada."
 
@@ -162,8 +162,8 @@ msgstr "Ayuda"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Limitar el acceso a %s a los grupos que cumplan este criterio:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -198,8 +198,8 @@ msgid "groups found"
 msgstr "grupos encontrados"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Que atributo debe ser usado como login:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -266,8 +266,8 @@ msgstr "Puede especificar el DN base para usuarios y grupos en la pestaña Avanz
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Limitar el acceso a %s a los usuarios que cumplan el siguiente criterio:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -409,41 +409,51 @@ msgstr "Atributos de busqueda de grupo"
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Atributos especiales"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Cuota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Cuota por defecto"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "E-mail"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Regla para la carpeta Home de usuario"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Nombre de usuario interno"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atributo Nombre de usuario Interno:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Sobrescribir la detección UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Atributo UUID para usuarios:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Atributo UUID para Grupos:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación del Nombre de usuario de un usuario LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Borrar la asignación de los Nombres de usuario de los usuarios LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index c9eaf5ba16..55a2016cd4 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013
+# pisike.sipelgas <pisike.sipelgas@gmail.com>, 2013-2014
 # Rivo Zängov <eraser@eraser.ee>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +19,11 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s jagas sinuga »%s«"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s "
@@ -41,19 +40,6 @@ msgstr "Haldusrežiimis välja lülitatud"
 msgid "Updated database"
 msgstr "Uuendatud andmebaas"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Failipuhvri uuendamine, see võib kesta väga kaua..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Uuendatud failipuhver"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% tehtud ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ühtegi pilti või faili pole pakutud"
@@ -74,135 +60,139 @@ msgstr "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti"
 msgid "No crop data provided"
 msgstr "Lõikeandmeid ei leitud"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Reede"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Jaanuar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Veebruar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Märts"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Aprill"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juuni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juuli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktoober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Detsember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Salvestamine..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut tagasi"
 msgstr[1] "%n minutit tagasi"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n tund tagasi"
 msgstr[1] "%n tundi tagasi"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "täna"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n päev tagasi"
 msgstr[1] "%n päeva tagasi"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n kuu tagasi"
 msgstr[1] "%n kuud tagasi"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "aastat tagasi"
 
@@ -270,6 +260,26 @@ msgstr "({count} valitud)"
 msgid "Error loading file exists template"
 msgstr "Viga faili olemasolu malli laadimisel"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Jagatud"
@@ -278,12 +288,12 @@ msgstr "Jagatud"
 msgid "Share"
 msgstr "Jaga"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Viga"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Viga jagamisel"
 
@@ -295,123 +305,123 @@ msgstr "Viga jagamise lõpetamisel"
 msgid "Error while changing permissions"
 msgstr "Viga õiguste muutmisel"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Jagatud sinu ja {group} grupiga {owner} poolt"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Sinuga jagas {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Jaga kasutaja või grupiga ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Jaga linki"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Parool"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Luba avalik üleslaadimine"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Saada link isikule e-postiga"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Saada"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Määra aegumise kuupäev"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Aegumise kuupäev"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Jaga e-postiga:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Ühtegi inimest ei leitud"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupp"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Edasijagamine pole lubatud"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Jagatud {item} kasutajaga {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Lõpeta jagamine"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "teavita e-postiga"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "saab muuta"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "ligipääsukontroll"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "loo"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "uuenda"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "kustuta"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "jaga"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupäeva eemaldamisel"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupäeva määramisel"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Saatmine ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-kiri on saadetud"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Hoiatus"
 
@@ -458,11 +468,17 @@ msgstr "Uuendus ebaõnnestus. Palun teavita probleemidest  <a href=\"https://git
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s parooli lähtestus"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Kasuta järgnevat linki oma parooli taastamiseks: {link}"
@@ -482,8 +498,8 @@ msgstr "Päring ebaõnnestus!<br>Oled sa veendunud, et e-post/kasutajanimi on õ
 msgid "You will receive a link to reset your password via Email."
 msgstr "Sinu parooli taastamise link saadetakse sulle e-postile."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Kasutajanimi"
 
@@ -519,6 +535,18 @@ msgstr "Uus parool"
 msgid "Reset password"
 msgstr "Nulli parool"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Isiklik"
@@ -527,7 +555,7 @@ msgstr "Isiklik"
 msgid "Users"
 msgstr "Kasutajad"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Rakendused"
 
@@ -583,7 +611,7 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr "Hei,\n\nlihtsalt annan sulle teada, et %s jagas sulle välja %s.\nVaata seda: %s\n\n"
+msgstr "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
@@ -637,49 +665,47 @@ msgstr "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_bl
 msgid "Create an <strong>admin account</strong>"
 msgstr "Loo <strong>admini konto</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Täpsem"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Andmete kaust"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Seadista andmebaasi"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "kasutatakse"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Andmebaasi kasutaja"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Andmebaasi parool"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Andmebasi nimi"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Andmebaasi tabeliruum"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Andmebaasi host"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Lõpetamine ..."
 
@@ -695,7 +721,7 @@ msgstr "See rakendus vajab toimimiseks JavaScripti. Palun <a href=\"http://enabl
 msgid "%s is available. Get more information on how to update."
 msgstr "%s on saadaval. Vaata lähemalt kuidas uuendada."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Logi välja"
 
@@ -721,28 +747,28 @@ msgstr "Serveripoolne autentimine ebaõnnestus!"
 msgid "Please contact your administrator."
 msgstr "Palun kontakteeru oma süsteemihalduriga."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Kaotasid oma parooli?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "pea meeles"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Logi sisse"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternatiivsed sisselogimisviisid"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sulle välja »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index e83960e36b..780aa687c9 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 07:20+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,283 +19,290 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Ei saa liigutada faili %s - samanimeline fail on juba olemas"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "%s liigutamine ebaõnnestus"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Faili nimi ei saa olla tühi."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Faili nimi ei tohi sisaldada \"/\". Palun vali mõni teine nimi."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Nimi %s on juba kasutusel kataloogis %s. Palun vali mõni teine nimi."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Pole korrektne lähteallikas"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Server ei võimalda URL-ide avamist, palun kontrolli serveri seadistust"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Viga %s allalaadimisel %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Viga faili loomisel"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Kataloogi nimi ei saa olla tühi."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Kataloogi nimi ei tohi sisaldada \"/\". Palun vali mõni teine nimi."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Viga kataloogi loomisel"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Üleslaadimiste kausta määramine ebaõnnestus."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Vigane kontrollkood"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ühtegi faili ei laetud üles. Tundmatu viga"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Ühtegi tõrget polnud, fail on üles laetud"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti üles ainult osaliselt"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Ühtegi faili ei laetud üles"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Kettale kirjutamine ebaõnnestus"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Saadaval pole piisavalt ruumi"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Vigane kaust."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Failid"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Pole piisavalt ruumi"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Serverist ei saadud tulemusi"
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL ei saa olla tühi"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Kodukataloogis 'Shared' on reserveeritud failinimi"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Ei suuda luua faili"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Ei suuda luua kataloogi"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Viga URL-i haaramisel"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Jaga"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Kustuta jäädavalt"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Nimeta ümber"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Ei suuda faili ümber nimetada"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "asendas nime {old_name} nimega {new_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Viga faili kustutamisel."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kataloog"
 msgstr[1] "%n kataloogi"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fail"
 msgstr[1] "%n faili"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} ja {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laadin üles %n faili"
 msgstr[1] "Laadin üles %n faili"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' on vigane failinimi."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Su andmemaht on peaaegu täis ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Krüpteerimisrakend on lubatud, kuid võtmeid pole lähtestatud. Palun logi välja ning uuesti sisse."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Vigane Krüpteerimisrakendi privaatvõti . Palun uuenda oma privaatse võtme parool oma personaasete seadete all taastamaks ligipääsu oma krüpteeritud failidele."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Valmistatakse allalaadimist. See võib võtta veidi aega, kui on tegu suurte failidega. "
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Viga faili eemaldamisel"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Viga"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Muudetud"
 
@@ -303,12 +310,12 @@ msgstr "Muudetud"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Vigane kausta nimi. Nime 'Shared' kasutamine on reserveeritud."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ümbernimetamine ebaõnnestus"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Lae üles"
 
@@ -344,72 +351,68 @@ msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
 msgid "Save"
 msgstr "Salvesta"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Uus"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Uus tekstifail"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Tekstifail"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Kaust"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Allikast"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Kustutatud failid"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Tühista üleslaadimine"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Sul puuduvad õigused siia failide üleslaadimiseks või tekitamiseks"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi üles!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Üleslaadimine on liiga suur"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Faile skannitakse, palun oota."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Praegune skannimine"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Failisüsteemi puhvri uuendamine..."
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index c62b1fa13e..565c6e2090 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-11-29 20:10+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,18 +82,18 @@ msgid ""
 "administrator"
 msgstr "Tundmatu tõrge. Palun kontrolli süsteemi seadeid või võta ühendust oma süsteemi administraatoriga"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Nõutavad on puudu."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Järgmised kasutajad pole seadistatud krüpteeringuks:"
 
@@ -101,9 +101,9 @@ msgstr "Järgmised kasutajad pole seadistatud krüpteeringuks:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Salvestamine..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 8b5da6014e..1a9f3c5430 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Ligipääs on antud"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Viga Dropboxi salvestusruumi seadistamisel"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Anna ligipääs"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Viga Google Drive'i salvestusruumi seadistamisel"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Hoiatus:</b> \"smbclient\" pole paigaldatud. Jagatud CIFS/SMB hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata SAMBA tugi."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Hoiatus:</b> PHP-s puudub FTP tugi. Jagatud FTP hoidlate ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Kasutajad"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Luba kasutajatele väline salvestamine"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL root sertifikaadid"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Impordi root sertifikaadid"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 5e8201efb5..4478b66ad3 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Jagas {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "See jagamine on parooliga kaitstud"
@@ -55,32 +59,16 @@ msgstr "jagamine on peatatud"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s jagas sinuga kausta %s"
+msgid "shared by %s"
+msgstr "jagas %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s jagas sinuga faili %s"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Lae alla"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Lae üles"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Tühista üleslaadimine"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Eelvaadet pole saadaval"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Otsene link"
diff --git a/l10n/et_EE/files_trashbin.po b/l10n/et_EE/files_trashbin.po
index b14ecfceb1..daf82c7cff 100644
--- a/l10n/et_EE/files_trashbin.po
+++ b/l10n/et_EE/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s jäädavalt kustutamine ebaõnnestus"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "%s ei saa taastada"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Kustutatud failid"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Viga"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "taastatud"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Siin pole midagi. Sinu prügikast on tühi!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Taasta"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Kustutatud"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Kustutatud failid"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 7f76fa1522..d163514efb 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,38 +19,38 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Rakendit \"%s\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Ühegi rakendi nime pole määratletud"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Abiinfo"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Isiklik"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Seaded"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Kasutajad"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Ebaõnnestunud uuendus \"%s\"."
@@ -63,15 +63,10 @@ msgstr "Tundmatu failitüüp"
 msgid "Invalid image"
 msgstr "Vigane pilt"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "veebitenused sinu kontrolli all"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "ei suuda avada \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP-ina allalaadimine on välja lülitatud."
@@ -94,74 +89,78 @@ msgid ""
 "administrator."
 msgstr "Palun laadi failid alla eraldi väiksemate osadena või palu abi oma süsteemihaldurilt."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Ühegi lähteallikat pole rakendi paigalduseks määratletud"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Ühtegi aadressi pole määratletud rakendi paigalduseks veebist"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Ühtegi teed pole määratletud paigaldamaks rakendit kohalikust failist"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "%s tüüpi arhiivid pole toetatud"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Arhiivi avamine ebaõnnestus rakendi paigalduse käigus"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Rakend ei paku ühtegi info.xml faili"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga."
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos."
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Rakendi kataloog on juba olemas"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Rakendus pole sisse lülitatud"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Autentimise viga"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Kontrollkood aegus. Paelun lae leht uuesti."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Failid"
@@ -201,8 +200,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Sisesta kas juba olemasolev konto või administrator."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL kasutajatunnus ja/või parool pole õiged"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -229,21 +228,21 @@ msgstr "Tõrkuv käsk oli: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL kasutaja '%s'@'localhost' on juba olemas."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Kustuta see kasutaja MySQL-ist"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL kasutaja '%s'@'%%' on juba olemas"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Kustuta see kasutaja MySQL-ist."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -270,66 +269,72 @@ msgstr "Määra admin kasutajanimi."
 msgid "Set an admin password."
 msgstr "Määra admini parool."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s jagas sinuga »%s«"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Ei leia kategooriat \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n minutit tagasi"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n tundi tagasi"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "täna"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "eile"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n päeva tagasi"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n kuud tagasi"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "aastat tagasi"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index e8e52f6d3d..658a109771 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-13 14:43-0500\n"
-"PO-Revision-Date: 2013-12-13 10:10+0000\n"
-"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,48 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-kiri on saadetud"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Krüpteerimine"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "App Store'i nimekirja laadimine ebaõnnestus"
@@ -115,62 +157,90 @@ msgstr "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuen
 msgid "Unable to change password"
 msgstr "Ei suuda parooli muuta"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Kasutaja dokumentatsioon"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Uuenda versioonile {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Lülita välja"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Lülita sisse"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Palun oota..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Viga rakenduse keelamisel"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Viga rakenduse lubamisel"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Uuendamine..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Viga rakenduse uuendamisel"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Viga"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Uuenda"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Uuendatud"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Vali profiili pilt"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Salvestamine..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "kustutatud"
@@ -183,40 +253,40 @@ msgstr "tagasi"
 msgid "Unable to remove user"
 msgstr "Kasutaja eemaldamine ebaõnnestus"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupid"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupi admin"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Kustuta"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "lisa grupp"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Sisesta nõuetele vastav kasutajatunnus"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Viga kasutaja loomisel"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Sisesta nõuetele vastav parool"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Eesti"
 
@@ -240,18 +310,42 @@ msgstr "Veateated ja tõsised probleemid"
 msgid "Fatal issues only"
 msgstr "Ainult tõsised probleemid"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Pole"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Logi sisse"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Turvahoiatus"
 
-#: templates/admin.php:25
+#: 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 "Sa kasutad %s ligipääsuks HTTP protokolli. Soovitame tungivalt seadistada oma server selle asemel kasutama HTTPS-i."
 
-#: templates/admin.php:39
+#: 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 "
@@ -260,68 +354,68 @@ msgid ""
 "root."
 msgstr "Andmete kataloog ja failid on tõenäoliselt internetis avalikult saadaval. .htaccess fail, ei toimi. Soovitame tungivalt veebiserver seadistada selliselt, et andmete kataloog ei oleks enam vabalt saadaval või tõstaksid andmete kataloogi oma veebiserveri veebi juurkataloogist mujale."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Paigalduse hoiatus"
 
-#: templates/admin.php:53
+#: 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 "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Palun kontrolli uuesti <a href=\"%s\">paigaldusjuhendeid</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Moodul 'fileinfo' puudub"
 
-#: templates/admin.php:68
+#: 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 "PHP moodul 'fileinfo' puudub. Soovitame tungivalt see lisada saavutamaks parimaid tulemusi failitüüpide tuvastamisel."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "PHP versioon on aegunud"
 
-#: templates/admin.php:82
+#: 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 "Sinu PHP versioon on aegunud. Soovitame tungivalt uuenda versioonile 5.3.8 või uuemale, kuna varasemad versioonid on teadaolevalt vigased. On võimalik, et see käesolev paigaldus ei toimi korrektselt."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokalisatsioon ei toimi"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Süsteemi lokaliseeringuks ei saa panna sellist, mis toetab UTF-8-t."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "See tähendab, et võib esineda probleeme failide nimedes mõnede sümbolitega."
 
-#: templates/admin.php:106
+#: 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 "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Internetiühendus ei toimi"
 
-#: templates/admin.php:121
+#: 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 "
@@ -330,118 +424,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Käivita toiming igal lehe laadimisel"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti tagant."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Jagamine"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Luba Share API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Luba rakendustel kasutada Share API-t"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Luba lingid"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Luba avalikud üleslaadimised"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Luba kasutajatel üleslaadimine teiste poolt oma avalikult jagatud kataloogidesse "
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Luba edasijagamine"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Luba kasutajatel kõigiga jagada"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Luba teavitused e-postiga"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Luba kasutajatel saata jagatud failide kohta e-postiga teavitusi"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Turvalisus"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Sunni peale HTTPS-i kasutamine"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Sunnib kliente %s ühenduma krüpteeritult."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Serveri aadress"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Kasutajatunnused"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Logi tase"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Rohkem"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Vähem"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versioon"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -451,30 +605,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Lisa oma rakendus"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Veel rakendusi"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Vali programm"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Kasutaja dokumentatsioon"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administraatori dokumentatsioon"
@@ -508,7 +666,7 @@ msgstr "Näita veelkord Esmase Käivituse Juhendajat"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Parool"
 
@@ -520,151 +678,149 @@ msgstr "Sinu parooli on muudetud"
 msgid "Unable to change your password"
 msgstr "Sa ei saa oma parooli muuta"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Praegune parool"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Uus parool"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Täispikk nimi"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Sinu e-posti aadress"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profiili pilt"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Laadi uus üles"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Vali failidest uus"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Eemalda pilt"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Kas png või jpg. Võimalikult ruudukujuline, kuid sul on võimalus seda veel lõigata."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Sinu avatari pakub sinu algne konto."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Katkesta"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Loobu"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Vali profiilipildiks"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Keel"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Aita tõlkida"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Krüpteerimine"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Sisselogimise parool"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Dekrüpteeri kõik failid"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Kasutajanimi"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Lisa"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Admini parooli taastamine"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Vaikimisi maht"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Piiramatult"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Kasutajanimi"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Maht"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "Muuda täispikka nime"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "määra uus parool"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Vaikeväärtus"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index afe426888c..6843303969 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,43 +88,43 @@ msgstr "Korras"
 msgid "Error"
 msgstr "Viga"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Seadistus on korras"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Seadistus on vigane"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Seadistus on puudulik"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Vali grupid"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Vali objekti klassid"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Vali atribuudid"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Ühenduse testimine õnnestus"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Ühenduse testimine ebaõnnestus"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Oled kindel, et tahad kustutada praegust serveri seadistust?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Kinnita kustutamine"
 
@@ -142,11 +142,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s kasutaja leitud"
 msgstr[1] "%s kasutajat leitud"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Vigane server"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Ei suuda leida soovitud funktsioonaalsust"
 
@@ -164,8 +164,8 @@ msgstr "Abiinfo"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Piira ligipääs %s grupile, mis sobivad kriteeriumiga:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -200,8 +200,8 @@ msgid "groups found"
 msgstr "gruppi leitud"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Mis atribuuti kasutada sisselogimise kasutajatunnusena:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -268,8 +268,8 @@ msgstr "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaar
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Piira ligipääs %s kasutajale, kes sobivad kriteeriumiga:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -411,41 +411,51 @@ msgstr "Grupi otsingu atribuudid"
 msgid "Group-Member association"
 msgstr "Grupiliikme seotus"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Spetsiifilised atribuudid"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Mahupiirangu atribuut"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Vaikimisi mahupiirang"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "baitides"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "E-posti väli"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Kasutaja kodukataloogi nimetamise reegel"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Sisemine kasutajanimi"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URLi osaks, näiteks kõikidel *DAV teenustel. Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Sisemise kasutajatunnuse atribuut:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Tühista UUID tuvastus"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID atribuut kasutajatele:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID atribuut gruppidele:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "LDAP-Kasutajatunnus Kasutaja Vastendus"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Puhasta LDAP-Grupinimi Grupp Vastendus"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index ccd0336727..caf5ea8071 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +19,11 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s-ek »%s« zurekin partekatu du"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Ezin izan da posta bidali hurrengo erabiltzaileei: %s"
@@ -41,19 +40,6 @@ msgstr "Mantenu modua desgaitu da"
 msgid "Updated database"
 msgstr "Datu basea eguneratu da"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Fitxategi katxea eguneratzen, honek oso denbora luzea har dezake..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Fitxategi katxea eguneratu da"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% egina ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ez da irudi edo fitxategirik zehaztu"
@@ -74,135 +60,139 @@ msgstr "Ez dago behin-behineko profil irudirik, saiatu berriro"
 msgid "No crop data provided"
 msgstr "Ez da ebaketarako daturik zehaztu"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Igandea"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Astelehena"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Ostirala"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Otsaila"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Martxoa"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Apirila"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maiatza"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Ekaina"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Uztaila"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Abuztua"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Iraila"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Urria"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Azaroa"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Abendua"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Gordetzen..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "orain dela minutu %n"
 msgstr[1] "orain dela %n minutu"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "orain dela ordu %n"
 msgstr[1] "orain dela %n ordu"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "orain dela egun %n"
 msgstr[1] "orain dela %n egun"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "orain dela hilabete %n"
 msgstr[1] "orain dela %n hilabete"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "urte"
 
@@ -270,6 +260,26 @@ msgstr "({count} hautatuta)"
 msgid "Error loading file exists template"
 msgstr "Errorea fitxategia existitzen da txantiloiak kargatzerakoan"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Elkarbanatuta"
@@ -278,12 +288,12 @@ msgstr "Elkarbanatuta"
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Errorea"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Errore bat egon da elkarbanatzean"
 
@@ -295,123 +305,123 @@ msgstr "Errore bat egon da elkarbanaketa desegitean"
 msgid "Error while changing permissions"
 msgstr "Errore bat egon da baimenak aldatzean"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner}-k zu eta {group} taldearekin elkarbanatuta"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner}-k zurekin elkarbanatuta"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Elkarbanatu erabiltzaile edo taldearekin..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Elkarbanatu lotura"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Pasahitza"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Gaitu igotze publikoa"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Postaz bidali lotura "
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Bidali"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Ezarri muga data"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Muga data"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Elkarbanatu eposta bidez:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Ez da inor aurkitu"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "taldea"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Berriz elkarbanatzea ez dago baimendua"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "{user}ekin {item}-n elkarbanatuta"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "jakinarazi eposta bidez"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "editatu dezake"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "sarrera kontrola"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "sortu"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "eguneratu"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "ezabatu"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "elkarbanatu"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Pasahitzarekin babestuta"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Bidaltzen ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Eposta bidalia"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Abisua"
 
@@ -458,11 +468,17 @@ msgstr "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s pasahitza berrezarri"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}"
@@ -482,8 +498,8 @@ msgstr "Eskaerak huts egin du!<br>Ziur zaude posta/pasahitza zuzenak direla?"
 msgid "You will receive a link to reset your password via Email."
 msgstr "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Erabiltzaile izena"
 
@@ -519,6 +535,18 @@ msgstr "Pasahitz berria"
 msgid "Reset password"
 msgstr "Berrezarri pasahitza"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Pertsonala"
@@ -527,7 +555,7 @@ msgstr "Pertsonala"
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplikazioak"
 
@@ -637,49 +665,47 @@ msgstr "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Aurreratua"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datuen karpeta"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Konfiguratu datu basea"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "erabiliko da"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datubasearen erabiltzailea"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Datubasearen pasahitza"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Datubasearen izena"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Datu basearen taula-lekua"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Datubasearen hostalaria"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Bukatzen..."
 
@@ -695,7 +721,7 @@ msgstr "Aplikazio honek ongi funtzionatzeko JavaScript gaitua behar du. Mesedez
 msgid "%s is available. Get more information on how to update."
 msgstr "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Saioa bukatu"
 
@@ -721,28 +747,28 @@ msgstr "Zerbitzari aldeko autentifikazioak huts egin du!"
 msgid "Please contact your administrator."
 msgstr "Mesedez jarri harremetan zure administradorearekin."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Galdu duzu pasahitza?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "gogoratu"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Hasi saioa"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Beste erabiltzaile izenak"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Kaixo<br><br>%s-ek %s zurekin partekatu duela jakin dezazun.<br><a href=\"%s\">\nIkusi ezazu</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 98e24d2cd0..8245bccc02 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# asieriko <asieriko@gmail.com>, 2013
+# asieriko <asieriko@gmail.com>, 2013-2014
 # Piarres Beobide <pi@beobide.net>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,283 +19,290 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Ezin dira fitxategiak mugitu %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Fitxategi izena ezin da hutsa izan."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Fitxategi izenak ezin du \"/\" izan. Mesedez hautatu beste izen bat."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "%s izena dagoeneko erabilita dago %s karpetan. Mesdez hautatu izen ezberdina."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Ez da jatorri baliogarria"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
+msgstr "Zerbitzaria ez dago URLak irekitzeko baimendua, mesedez egiaztatu zerbitzariaren konfigurazioa"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Errorea %s %sra deskargatzerakoan"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Errorea fitxategia sortzerakoan"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Karpeta izena ezin da hutsa izan."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Karpeta izenak ezin du \"/\" izan. Mesedez hautatu beste izen bat."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Errorea karpeta sortzerakoan"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Ezin da igoera direktorioa ezarri."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Lekuko baliogabea"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da errorerik egon, fitxategia ongi igo da"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat bakarrik igo da"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Aldi bateko karpeta falta da"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Errore bat izan da diskoan idazterakoan"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Ez dago behar aina leku erabilgarri,"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Igoerak huts egin du. Ezin izan da igotako fitxategia aurkitu"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Baliogabeko karpeta."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Fitxategiak"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Ez dago leku nahikorik."
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Ezin da zerbitzaritik emaitzik lortu"
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URLa ezin da hutsik egon"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Etxeko (home) karpetan 'Shared' erreserbatutako fitxategi izena da"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Ezin izan da fitxategia sortu"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Ezin izan da karpeta sortu"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
-msgstr ""
+msgstr "Errorea URLa eskuratzerakoan"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Ezabatu betirako"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Zain"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Ezin izan da fitxategia berrizendatu"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Errorea fitxategia ezabatzerakoan."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "karpeta %n"
 msgstr[1] "%n karpeta"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "fitxategi %n"
 msgstr[1] "%n fitxategi"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} eta {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Fitxategi %n igotzen"
 msgstr[1] "%n fitxategi igotzen"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' ez da fitxategi izen baliogarria."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Enkriptazio aplikazioa gaituta dago baina zure gakoak ez daude konfiguratuta, mesedez saioa bukatu eta berriro hasi"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Enkriptazio aplikaziorako gako pribatu okerra. Mesedez eguneratu zure gako pribatuaren pasahitza zure ezarpen pertsonaletan zure enkriptatuko fitxategietarako sarrera berreskuratzeko."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez  jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. "
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Errorea fitxategia mugitzean"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Errorea"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Aldatuta"
 
@@ -303,12 +310,12 @@ msgstr "Aldatuta"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Baliogabeako karpeta izena. 'Shared' izena erreserbatuta dago."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ezin da berrizendatu"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Igo"
 
@@ -344,72 +351,68 @@ msgstr "ZIP fitxategien gehienezko tamaina"
 msgid "Save"
 msgstr "Gorde"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Berria"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Testu fitxategi berria"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Testu fitxategia"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Karpeta berria"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Karpeta"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Estekatik"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ezabatutako fitxategiak"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Ez duzu fitxategiak hona igotzeko edo hemen sortzeko baimenik"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Igoera handiegia da"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Fitxategi sistemaren katxea eguneratzen..."
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 5384b72963..9013cba3e0 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-07 14:40+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,18 +83,18 @@ msgid ""
 "administrator"
 msgstr "Errore ezezaguna mesedez egiaztatu zure sistemaren ezarpenak edo harremanetan jarri zure administradorearekin"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Eskakizun batzuk ez dira betetzen."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago."
 
-#: hooks/hooks.php:278
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:"
 
@@ -102,9 +102,9 @@ msgstr "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Gordetzen..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 68f29e218e..4fb61478a3 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Piarres Beobide <pi@beobide.net>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Sarrera baimendua"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Errore bat egon da Dropbox biltegiratzea konfiguratzean"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Baimendu sarrera"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Abisua:</b> \"smbclient\" ez dago instalatuta. CIFS/SMB partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Abisua:</b> PHPren FTP modulua ez dago instalatuta edo gaitua. FTP partekatutako karpetak montatzea ez da posible. Mesedez eskatu zure sistema kudeatzaileari instalatzea."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Erabiltzaileak"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Gaitu erabiltzaileentzako Kanpo Biltegiratzea"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL erro ziurtagiriak"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Inportatu Erro Ziurtagiria"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 608ec647a9..16b72ac14d 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-14 21:50+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "{owner}-k partekatuta"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Elkarbanatutako hau pasahitzarekin babestuta dago"
@@ -54,32 +58,16 @@ msgstr "elkarbanatzea ez dago gaituta"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari"
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%sk zurekin %s karpeta elkarbanatu du"
+msgid "shared by %s"
+msgstr "%sk partekatuta"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%sk zurekin %s fitxategia elkarbanatu du"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Deskargatu"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Igo"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Ezeztatu igoera"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Ez dago aurrebista eskuragarririk hauentzat "
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Lotura zuzena"
diff --git a/l10n/eu/files_trashbin.po b/l10n/eu/files_trashbin.po
index 1687760864..bef48ecf43 100644
--- a/l10n/eu/files_trashbin.po
+++ b/l10n/eu/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Ezin izan da %s betirako ezabatu"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Ezin izan da %s berreskuratu"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Ezabatutako fitxategiak"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Errorea"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "Berrezarrita"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Ez dago ezer ez. Zure zakarrontzia hutsik dago!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Izena"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Berrezarri"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Ezabatutako Fitxategiak"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index aca65bbef7..cb55fbd589 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,38 +19,38 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "\"%s\" Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako"
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Ez da aplikazioaren izena zehaztu"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Laguntza"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Ezin izan da \"%s\" eguneratu."
@@ -63,15 +63,10 @@ msgstr "Fitxategi mota ezezaguna"
 msgid "Invalid image"
 msgstr "Baliogabeko irudia"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "ezin da \"%s\" ireki"
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP deskarga ez dago gaituta."
@@ -94,74 +89,78 @@ msgid ""
 "administrator."
 msgstr "Mesedez deskargatu fitzategiak zati txikiagoetan, banan-banan edo eskatu mesedez zure administradoreari."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Ez da jatorririk zehaztu aplikazioa instalatzerakoan"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Ez da href parametrorik zehaztu http bidez aplikazioa instalatzerakoan"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Ez da kokalekurik zehaztu fitxategi lokal moduan aplikazioa instalatzerakoan"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "%s motako fitxategiak ez dira onartzen"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Fitxategia irekitzeak huts egin du aplikazioa instalatzerakoan"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Aplikazioak ez du info.xml fitxategia"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Aplikazioa ezin da instalatu bertan duen baimendu gabeko kodea dela eta"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Aplikazioa ezin da instalatu <shipped>true</shipped> etiketa duelako eta etiketa hau ez da onartzen banaketan ez datozen aplikazioetan"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Aplikazioa ezin da instalatu info.xml/version bertsioa ez delako \"app store\"an jartzen duenaren berdina"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Aplikazioaren karpeta dagoeneko existitzen da"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Ezin izan da aplikazioaren karpeta sortu. Mesdez konpondu baimenak. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Aplikazioa ez dago gaituta"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Autentifikazio errorea"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Tokena iraungitu da. Mesedez birkargatu orria."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Fitxategiak"
@@ -201,8 +200,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Existitzen den kontu bat edo administradorearena jarri behar duzu."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL erabiltzaile edota pasahitza ez dira egokiak."
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -229,21 +228,21 @@ msgstr "Errorea komando honek sortu du: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL '%s'@'localhost' erabiltzailea dagoeneko existitzen da."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Ezabatu erabiltzaile hau MySQLtik"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Ezabatu erabiltzaile hau MySQLtik."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -270,66 +269,72 @@ msgstr "Ezarri administraziorako erabiltzaile izena."
 msgid "Set an admin password."
 msgstr "Ezarri administraziorako pasahitza."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Mesedez begiratu <a href='%s'>instalazio gidak</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s-ek »%s« zurekin partekatu du"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Ezin da \"%s\" kategoria aurkitu"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "segundu"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "orain dela minutu %n"
 msgstr[1] "orain dela %n minutu"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "orain dela ordu %n"
 msgstr[1] "orain dela %n ordu"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "gaur"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "atzo"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "orain dela egun %n"
 msgstr[1] "orain dela %n egun"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "orain dela hilabete %n"
 msgstr[1] "orain dela %n hilabete"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "joan den urtean"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "urte"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index fcb7b61c60..3968d2fbc1 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-11 13:31-0500\n"
-"PO-Revision-Date: 2013-12-10 21:50+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,48 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Eposta bidalia"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Enkriptazioa"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Ezin izan da App Dendatik zerrenda kargatu"
@@ -116,61 +158,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Ezin izan da pasahitza aldatu"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Erabiltzaile dokumentazioa"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Eguneratu {appversion}-ra"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Ez-gaitu"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Gaitu"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Itxoin mesedez..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Erroea izan da aplikazioa desgaitzerakoan"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Erroea izan da aplikazioa gaitzerakoan"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Eguneratzen..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Errorea aplikazioa eguneratzen zen bitartean"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Errorea"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Eguneratu"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Eguneratuta"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Profil argazkia aukeratu"
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Gordetzen..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -184,40 +254,40 @@ msgstr "desegin"
 msgid "Unable to remove user"
 msgstr "Ezin izan da erabiltzailea aldatu"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Taldeak"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Talde administradorea"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "gehitu taldea"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Baliozko erabiltzaile izena eman behar da"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Errore bat egon da erabiltzailea sortzean"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Baliozko pasahitza eman behar da"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Euskera"
 
@@ -241,18 +311,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ezer"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Saio hasiera"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Segurtasun abisua"
 
-#: templates/admin.php:25
+#: 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 bidez erabiltzen ari zara. Aholkatzen dizugu zure zerbitzaria HTTPS erabil dezan."
 
-#: templates/admin.php:39
+#: 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 "
@@ -261,68 +355,68 @@ msgid ""
 "root."
 msgstr "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke.  .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Konfiguratu Abisuak"
 
-#: templates/admin.php:53
+#: 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 "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Mesedez birpasatu <a href=\"%s\">instalazio gidak</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "'fileinfo' Modulua falta da"
 
-#: templates/admin.php:68
+#: 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 "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Zure PHP bertsioa zaharkituta dago"
 
-#: templates/admin.php:82
+#: 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 "Zure PHP bertsioa zaharkituta dago. Gure aholkua 5.3.8 edo bertsio berriago batera eguneratzea da, bertsio zaharragoak arazoak ematen baitituzte. Posible da instalazio honek ez funtzionatzea ongi."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokala ez dabil"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Sistemaren lokala ezin da UTF-8 onartzen duen batera ezarri."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela."
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Interneteko konexioak ez du funtzionatzen"
 
-#: templates/admin.php:121
+#: 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 "
@@ -331,118 +425,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Exekutatu zeregin bat orri karga bakoitzean"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php webcron zerbitzu batean erregistratua dago cron.php  15 minuturo http bidez deitzeko."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Erabili sistemaren cron zerbitzua cron.php fitxategia 15 minuturo deitzeko."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Partekatzea"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Gaitu Elkarbanatze APIa"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Baimendu aplikazioak Elkarbanatze APIa erabiltzeko"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Baimendu loturak"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki elkarbanatzen"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Baimendu igoera publikoak"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Baimendu erabiltzaileak besteak bere partekatutako karpetetan fitxategiak igotzea"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Baimendu birpartekatzea"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Baimendu erabiltzaileak haiekin elkarbanatutako fitxategiak berriz ere elkarbanatzen"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Baimendu erabiltzaileak edonorekin elkarbanatzen"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin elkarbanatzen"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Baimendu posta bidezko jakinarazpenak"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Baimendu erabiltzailea posta bidezko jakinarazpenak bidaltzen partekatutako fitxategietarako"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Segurtasuna"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Behartu HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Zerbitzariaren helbidea"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Portua"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Kredentzialak"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Erregistro maila"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Gehiago"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Gutxiago"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Bertsioa"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -452,30 +606,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Gehitu zure aplikazioa"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "App gehiago"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Aukeratu programa bat"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Ikusi programen orria apps.owncloud.com en"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Erabiltzaile dokumentazioa"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administradore dokumentazioa"
@@ -509,7 +667,7 @@ msgstr "Erakutsi berriz Lehenengo Aldiko Morroia"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -521,151 +679,149 @@ msgstr "Zere pasahitza aldatu da"
 msgid "Unable to change your password"
 msgstr "Ezin izan da zure pasahitza aldatu"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Uneko pasahitza"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Pasahitz berria"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Aldatu pasahitza"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Izena"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Zure e-posta"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilaren irudia"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Igo berria"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Hautatu berria Fitxategietatik"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Irudia ezabatu"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "png edo jpg. Hobe karratua baina mozteko aukera izango duzu."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Bertan-behera utzi"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Ezeztatu"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Profil irudi bezala aukeratu"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Lagundu itzultzen"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Enkriptazioa"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak."
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Saioa hasteko pasahitza"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Desenkripattu fitxategi guztiak"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Sarrera Izena"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Sortu"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Kudeatzaile pasahitz berreskuratzea"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Lehenetsitako Biltegiratzea"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Mugarik gabe"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Erabiltzaile izena"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Biltegiratzea"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "aldatu izena"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "ezarri pasahitz berria"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Lehenetsia"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 017372efcd..502322ad15 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +87,43 @@ msgstr "Arrakasta"
 msgid "Error"
 msgstr "Errorea"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Konfigurazioa ongi dago"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Konfigurazioa ez dago ongi"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Konfigurazioa osatu gabe dago"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Hautatu taldeak"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Hautatu objektu klaseak"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Hautatu atributuak"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Konexio froga ongi burutu da"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Konexio frogak huts egin du"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Baieztatu Ezabatzea"
 
@@ -141,11 +141,11 @@ msgid_plural "%s users found"
 msgstr[0] "Erabiltzaile %s aurkitu da"
 msgstr[1] "%s erabiltzaile aurkitu dira"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Baliogabeko hostalaria"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Ezin izan da nahi zen ezaugarria aurkitu"
 
@@ -163,8 +163,8 @@ msgstr "Laguntza"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Mugatu sarrera baldintza hauek betetzen dituzten %s taldetara:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -199,8 +199,8 @@ msgid "groups found"
 msgstr "talde aurkituta"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Sarrera izen gisa erabiliko den atributua:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -267,8 +267,8 @@ msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu f
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Mugatu sarrera hurrengo baldintzak betetzen duten %s erabiltzaileei:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -410,41 +410,51 @@ msgstr "Taldekatu Bilaketa Atributuak "
 msgid "Group-Member association"
 msgstr "Talde-Kide elkarketak"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Atributu Bereziak"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kuota Eremua"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Kuota Lehenetsia"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "bytetan"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Eposta eremua"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Barneko erabiltzaile izena"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +470,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Baliogabeko Erabiltzaile Izen atributua"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Gainidatzi UUID antzematea"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +489,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Erabiltzaileentzako UUID atributuak:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Taldeentzako UUID atributuak:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +515,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 0bb862f9f4..d2c3ce4ab9 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-18 02:03+0200\n"
-"PO-Revision-Date: 2012-10-18 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,227 +17,504 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
-msgid "Application name not provided."
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/vcategories/add.php:29
-msgid "No category to add?"
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
 msgstr ""
 
-#: ajax/vcategories/add.php:36
-msgid "This category already exists: "
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
 msgstr ""
 
-#: js/js.js:238 templates/layout.user.php:49 templates/layout.user.php:50
-msgid "Settings"
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
 msgstr ""
 
-#: js/js.js:670
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:36
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:41
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:42
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/js.js:670
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/js.js:670
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/js.js:670
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/js.js:670
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/js.js:670
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/js.js:671
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
+#: js/js.js:458
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:996
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:997
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:998
+msgid "today"
+msgstr ""
+
+#: js/js.js:999
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1000
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1001
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1002
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1003
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:1004
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1005
+msgid "years ago"
+msgstr ""
+
 #: js/oc-dialogs.js:123
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
-msgid "Cancel"
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
 msgstr ""
 
-#: js/oc-dialogs.js:159
-msgid "No"
-msgstr ""
-
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:172
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
 msgid "Ok"
 msgstr ""
 
-#: js/oc-vcategories.js:68
-msgid "No categories selected for deletion."
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
 msgstr ""
 
-#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:497
-#: js/share.js:509
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr "Ezeztatu"
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:103
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:114
+#: js/share.js:171
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:121
+#: js/share.js:178
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:130
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:132
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:137
-msgid "Share with"
+#: js/share.js:214
+msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:142
-msgid "Share with link"
+#: js/share.js:220
+msgid "Share link"
 msgstr ""
 
-#: js/share.js:143
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:147 templates/installation.php:42 templates/login.php:24
-#: templates/verify.php:13
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:152
+#: js/share.js:230
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:234
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:235
+msgid "Send"
+msgstr ""
+
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:185
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:214
+#: js/share.js:324 js/share.js:363
+msgid "group"
+msgstr ""
+
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:250
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:283
+#: js/share.js:409
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:285
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:288
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:291
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:294
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:297
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:322 js/share.js:484
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:497
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:509
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: lostpassword/index.php:26
-msgid "ownCloud password reset"
+#: js/share.js:754
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:765
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:789
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:8
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
 msgstr ""
 
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:3
+#: lostpassword/templates/lostpassword.php:7
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:5
-msgid "Requested"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:8
-msgid "Login failed!"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:14
-msgid "Request reset"
+#: lostpassword/templates/lostpassword.php:25
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
 msgstr ""
 
 #: lostpassword/templates/resetpassword.php:4
@@ -256,15 +533,27 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "Pertsonala"
 
 #: strings.php:6
 msgid "Users"
 msgstr ""
 
-#: strings.php:7
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -276,148 +565,237 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
 #: templates/403.php:12
 msgid "Access forbidden"
 msgstr ""
 
-#: templates/404.php:12
+#: templates/404.php:15
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:4
-msgid "Edit categories"
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
 msgstr ""
 
-#: templates/edit_categories_dialog.php:14
-msgid "Add"
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
 msgstr ""
 
-#: templates/installation.php:23 templates/installation.php:31
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
 msgid "Security Warning"
 msgstr ""
 
-#: templates/installation.php:24
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
 msgstr ""
 
-#: templates/installation.php:26
+#: templates/installation.php:34
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
 msgstr ""
 
-#: templates/installation.php:32
+#: templates/installation.php:40
 msgid ""
-"Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
 msgstr ""
 
-#: templates/installation.php:36
-msgid "Create an <strong>admin account</strong>"
+#: templates/installation.php:42
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
 msgstr ""
 
 #: templates/installation.php:48
-msgid "Advanced"
+msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:50
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:57
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:105
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:109
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:113
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:127
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:132
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:38
-msgid "web services under your control"
+#: templates/installation.php:150
+msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.user.php:34
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation.  "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
-#: templates/login.php:8
+#: templates/login.php:9
 msgid "Automatic logon rejected!"
 msgstr ""
 
-#: templates/login.php:9
+#: templates/login.php:10
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
 msgstr ""
 
-#: templates/login.php:10
+#: templates/login.php:12
 msgid "Please change your password to secure your account again."
 msgstr ""
 
-#: templates/login.php:15
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:27
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:28
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/logout.php:1
-msgid "You are logged out."
+#: templates/login.php:60
+msgid "Alternative Logins"
 msgstr ""
 
-#: templates/part.pagenavi.php:3
-msgid "prev"
-msgstr ""
-
-#: templates/part.pagenavi.php:20
-msgid "next"
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
+#: templates/mail.php:15
+#, php-format
 msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
-#: templates/verify.php:16
-msgid "Verify"
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
 msgstr ""
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index 473f8ab054..f57a7040ac 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/files.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-19 02:03+0200\n"
-"PO-Revision-Date: 2012-10-19 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,199 +17,304 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/upload.php:20
+#: ajax/move.php:15
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:25 ajax/move.php:28
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:58 js/files.js:98
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:119
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:156
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:21
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+#: ajax/upload.php:79
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:23
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:25
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: appinfo/app.php:6
+#: ajax/upload.php:103
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:160
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:108 templates/index.php:62
-msgid "Unshare"
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/fileactions.js:110 templates/index.php:64
-msgid "Delete"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/fileactions.js:182
-msgid "Rename"
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
 msgstr ""
 
-#: js/filelist.js:194 js/filelist.js:196
-msgid "{new_name} already exists"
-msgstr ""
-
-#: js/filelist.js:194 js/filelist.js:196
-msgid "replace"
-msgstr ""
-
-#: js/filelist.js:194
-msgid "suggest name"
-msgstr ""
-
-#: js/filelist.js:194 js/filelist.js:196
-msgid "cancel"
-msgstr ""
-
-#: js/filelist.js:243
-msgid "replaced {new_name}"
-msgstr ""
-
-#: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
-msgid "undo"
-msgstr ""
-
-#: js/filelist.js:245
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:277
-msgid "unshared {files}"
-msgstr ""
-
-#: js/filelist.js:279
-msgid "deleted {files}"
-msgstr ""
-
-#: js/files.js:179
-msgid "generating ZIP-file, it may take some time."
-msgstr ""
-
-#: js/files.js:214
-msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/files.js:214
-msgid "Upload Error"
-msgstr ""
-
-#: js/files.js:242 js/files.js:347 js/files.js:377
-msgid "Pending"
-msgstr ""
-
-#: js/files.js:262
-msgid "1 file uploading"
-msgstr ""
-
-#: js/files.js:265 js/files.js:310 js/files.js:325
-msgid "{count} files uploading"
-msgstr ""
-
-#: js/files.js:328 js/files.js:361
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:430
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:500
-msgid "Invalid name, '/' is not allowed."
+#: js/file-upload.js:564
+msgid "URL cannot be empty"
 msgstr ""
 
-#: js/files.js:681
-msgid "{count} files scanned"
+#: js/file-upload.js:568
+msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/files.js:689
-msgid "error while scanning"
+#: js/file-upload.js:570 js/filelist.js:430
+msgid "{new_name} already exists"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:48
+#: js/file-upload.js:636
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:652
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:702
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:121
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:134
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:138
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:142
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:379
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:610 js/files.js:654
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:610 js/files.js:654
+msgid "Error"
+msgstr ""
+
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:763 templates/index.php:56
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:764 templates/index.php:58
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:791
-msgid "1 folder"
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: js/files.js:793
-msgid "{count} folders"
+#: lib/app.php:111
+#, php-format
+msgid "%s could not be renamed"
 msgstr ""
 
-#: js/files.js:801
-msgid "1 file"
-msgstr ""
-
-#: js/files.js:803
-msgid "{count} files"
-msgstr ""
-
-#: js/files.js:846
-msgid "seconds ago"
-msgstr ""
-
-#: js/files.js:847
-msgid "1 minute ago"
-msgstr ""
-
-#: js/files.js:848
-msgid "{minutes} minutes ago"
-msgstr ""
-
-#: js/files.js:851
-msgid "today"
-msgstr ""
-
-#: js/files.js:852
-msgid "yesterday"
-msgstr ""
-
-#: js/files.js:853
-msgid "{days} days ago"
-msgstr ""
-
-#: js/files.js:854
-msgid "last month"
-msgstr ""
-
-#: js/files.js:856
-msgid "months ago"
-msgstr ""
-
-#: js/files.js:857
-msgid "last year"
-msgstr ""
-
-#: js/files.js:858
-msgid "years ago"
+#: lib/helper.php:14 templates/index.php:23
+msgid "Upload"
 msgstr ""
 
 #: templates/admin.php:5
@@ -220,80 +325,92 @@ msgstr ""
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/admin.php:7
+#: templates/admin.php:10
 msgid "max. possible: "
 msgstr ""
 
-#: templates/admin.php:9
+#: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
 msgstr ""
 
-#: templates/admin.php:9
+#: templates/admin.php:17
 msgid "Enable ZIP-download"
 msgstr ""
 
-#: templates/admin.php:11
+#: templates/admin.php:20
 msgid "0 is unlimited"
 msgstr ""
 
-#: templates/admin.php:12
+#: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:26
 msgid "Save"
-msgstr ""
+msgstr "Gorde"
 
-#: templates/index.php:7
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
 #: templates/index.php:9
-msgid "Text file"
+msgid "New text file"
 msgstr ""
 
 #: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:13
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:11
-msgid "From url"
+#: templates/index.php:17
+msgid "From link"
 msgstr ""
 
-#: templates/index.php:20
-msgid "Upload"
+#: templates/index.php:41
+msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:27
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:50
-msgid "Share"
-msgstr ""
-
-#: templates/index.php:52
+#: templates/index.php:74
 msgid "Download"
-msgstr ""
+msgstr "Deskargatu"
 
-#: templates/index.php:75
+#: templates/index.php:85 templates/index.php:86
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:77
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:82
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:85
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/eu_ES/files_encryption.po b/l10n/eu_ES/files_encryption.po
index 04e045a38e..8e857a6076 100644
--- a/l10n/eu_ES/files_encryption.po
+++ b/l10n/eu_ES/files_encryption.po
@@ -6,29 +6,196 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:295
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: templates/settings-admin.php:7
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: templates/settings-admin.php:11
+msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings.php:10
-msgid "Enable Encryption"
+#: templates/settings-admin.php:14
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:40
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:47
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:58
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:12
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:22
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:28
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:33
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:42
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:44
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:61
+msgid "Could not update file recovery"
 msgstr ""
diff --git a/l10n/eu_ES/files_external.po b/l10n/eu_ES/files_external.po
index 834d0a9c29..2795b2e529 100644
--- a/l10n/eu_ES/files_external.po
+++ b/l10n/eu_ES/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,90 +17,111 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:73 js/google.js:72
-msgid "Fill out all required fields"
-msgstr ""
-
-#: js/dropbox.js:85
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:26 js/google.js:73 js/google.js:78
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:516
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:519
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
-msgid "Mount point"
-msgstr ""
-
-#: templates/settings.php:8
-msgid "Backend"
-msgstr ""
-
-#: templates/settings.php:9
-msgid "Configuration"
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Options"
+msgid "External storage"
 msgstr ""
 
 #: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
-msgid "Add mount point"
+#: templates/settings.php:33
+msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:90
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:91
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:92
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:100
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
-msgstr ""
+msgstr "Ezabatu"
 
-#: templates/settings.php:87
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
-msgid "Allow users to mount their own external storage"
+#: templates/settings.php:130
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index 73be8ca650..449e26af6b 100644
--- a/l10n/eu_ES/files_sharing.po
+++ b/l10n/eu_ES/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,32 +17,56 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
 msgid "Password"
 msgstr ""
 
-#: templates/authenticate.php:6
-msgid "Submit"
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
 msgstr ""
 
-#: templates/public.php:9
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:29
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:37
-msgid "web services under your control"
+#: templates/public.php:48
+msgid "Direct link"
 msgstr ""
diff --git a/l10n/eu_ES/files_trashbin.po b/l10n/eu_ES/files_trashbin.po
new file mode 100644
index 0000000000..6705f5cbf2
--- /dev/null
+++ b/l10n/eu_ES/files_trashbin.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:852 lib/trashbin.php:854
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:23 templates/index.php:25
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:31
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:34 templates/index.php:35
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: templates/part.breadcrumb.php:8
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/eu_ES/files_versions.po b/l10n/eu_ES/files_versions.po
index 522299c7a2..1cf374bd9a 100644
--- a/l10n/eu_ES/files_versions.po
+++ b/l10n/eu_ES/files_versions.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-01-27 08:21+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,26 +17,27 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
 msgstr ""
 
-#: js/versions.js:16
-msgid "History"
-msgstr ""
-
-#: templates/settings-personal.php:4
+#: js/versions.js:14
 msgid "Versions"
 msgstr ""
 
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
+#: js/versions.js:60
+msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: templates/settings.php:3
-msgid "Files Versioning"
+#: js/versions.js:87
+msgid "More versions..."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Enable"
+#: js/versions.js:125
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:155
+msgid "Restore"
 msgstr ""
diff --git a/l10n/eu_ES/lib.po b/l10n/eu_ES/lib.po
index 120167c892..f24e2561ea 100644
--- a/l10n/eu_ES/lib.po
+++ b/l10n/eu_ES/lib.po
@@ -6,120 +6,333 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\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"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:288
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: app.php:295
+#: private/app.php:366
 msgid "Personal"
-msgstr ""
+msgstr "Pertsonala"
 
-#: app.php:300
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: app.php:305
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: app.php:312
-msgid "Apps"
-msgstr ""
-
-#: app.php:314
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: files.php:280
+#: private/app.php:875
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:281
+#: private/files.php:232
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:281 files.php:306
+#: private/files.php:233 private/files.php:261
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:305
+#: private/files.php:258
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: json.php:28
+#: private/files.php:259
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: json.php:39 json.php:63 json.php:75
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
-#: template.php:86
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: 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
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: 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
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:198
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:199
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:87
-msgid "1 minute ago"
-msgstr ""
+#: private/template/functions.php:134
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:88
-#, php-format
-msgid "%d minutes ago"
-msgstr ""
+#: private/template/functions.php:135
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:91
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: template.php:92
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: template.php:93
-#, php-format
-msgid "%d days ago"
-msgstr ""
+#: private/template/functions.php:139
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:94
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: template.php:95
-msgid "months ago"
-msgstr ""
+#: private/template/functions.php:142
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
 
-#: template.php:96
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: template.php:97
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
-
-#: updater.php:66
-#, php-format
-msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
-
-#: updater.php:68
-msgid "up to date"
-msgstr ""
-
-#: updater.php:71
-msgid "updates check is disabled"
-msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 10af27c233..4aa0c3e54f 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-09 02:03+0200\n"
-"PO-Revision-Date: 2012-10-09 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,159 +17,583 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/apps/ocs.php:23
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
+#: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/creategroup.php:19
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr ""
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:19
 msgid "Unable to add group"
 msgstr ""
 
-#: ajax/enableapp.php:14
-msgid "Could not enable app. "
-msgstr ""
-
-#: ajax/lostpassword.php:14
+#: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16
+#: ajax/lostpassword.php:14
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:16
-msgid "OpenID Changed"
-msgstr ""
-
-#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
-msgid "Invalid request"
-msgstr ""
-
-#: ajax/removegroup.php:16
+#: ajax/removegroup.php:13
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:22
+#: ajax/removeuser.php:25
 msgid "Unable to delete user"
 msgstr ""
 
-#: ajax/setlanguage.php:18
+#: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr ""
 
-#: ajax/togglegroups.php:25
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr "Eskakizun baliogabea"
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr ""
 
-#: ajax/togglegroups.php:31
+#: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr ""
 
-#: js/apps.js:28 js/apps.js:65
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:28 js/apps.js:54
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/personal.js:69
-msgid "Saving..."
+#: js/apps.js:95
+msgid "Please wait...."
 msgstr ""
 
-#: personal.php:47 personal.php:48
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:54
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:246
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:14
-msgid "Security Warning"
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
 msgstr ""
 
 #: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:64
 msgid ""
 "Your data directory and your files are probably accessible from the "
-"internet. The .htaccess file that ownCloud provides is not working. We "
-"strongly suggest that you configure your webserver in a way that the data "
-"directory is no longer accessible or you move the data directory outside the"
-" webserver document root."
+"internet. The .htaccess file is not working. We strongly suggest that you "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
 msgstr ""
 
-#: templates/admin.php:31
-msgid "Cron"
+#: templates/admin.php:75
+msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:37
-msgid "Execute one task with each page loaded"
-msgstr ""
-
-#: templates/admin.php:43
+#: templates/admin.php:78
 msgid ""
-"cron.php is registered at a webcron service. Call the cron.php page in the "
-"owncloud root once a minute over http."
-msgstr ""
-
-#: templates/admin.php:49
-msgid ""
-"Use systems cron service. Call the cron.php file in the owncloud folder via "
-"a system cronjob once a minute."
-msgstr ""
-
-#: templates/admin.php:56
-msgid "Sharing"
-msgstr ""
-
-#: templates/admin.php:61
-msgid "Enable Share API"
-msgstr ""
-
-#: templates/admin.php:62
-msgid "Allow apps to use the Share API"
-msgstr ""
-
-#: templates/admin.php:67
-msgid "Allow links"
-msgstr ""
-
-#: templates/admin.php:68
-msgid "Allow users to share items to the public with links"
-msgstr ""
-
-#: templates/admin.php:73
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:74
-msgid "Allow users to share items shared with them again"
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
 msgstr ""
 
 #: templates/admin.php:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:90
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:104
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:118
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:123
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:127
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:143
+msgid "Internet connection not working"
+msgstr ""
+
+#: 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 "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:192
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:200
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:205
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:219
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:228
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:81
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:88
+#: templates/admin.php:253
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:254
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:261
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:274
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:276
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:282
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:116
+#: templates/admin.php:377
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:124
+#: templates/admin.php:410
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:416 templates/personal.php:181
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -179,143 +603,222 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:10
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:11
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/help.php:9
-msgid "Documentation"
+#: templates/help.php:6
+msgid "Administrator Documentation"
 msgstr ""
 
-#: templates/help.php:10
-msgid "Managing Big Files"
+#: templates/help.php:9
+msgid "Online Documentation"
 msgstr ""
 
 #: templates/help.php:11
-msgid "Ask a question"
+msgid "Forum"
 msgstr ""
 
-#: templates/help.php:23
-msgid "Problems connecting to help database."
+#: templates/help.php:14
+msgid "Bugtracker"
 msgstr ""
 
-#: templates/help.php:24
-msgid "Go there manually."
-msgstr ""
-
-#: templates/help.php:32
-msgid "Answer"
+#: templates/help.php:17
+msgid "Commercial Support"
 msgstr ""
 
 #: templates/personal.php:8
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
-msgstr ""
-
-#: templates/personal.php:12
-msgid "Desktop and Mobile Syncing Clients"
-msgstr ""
-
-#: templates/personal.php:13
-msgid "Download"
+msgid "Get the apps to sync your files"
 msgstr ""
 
 #: templates/personal.php:19
-msgid "Your password was changed"
+msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:20
-msgid "Unable to change your password"
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:21
-msgid "Current password"
-msgstr ""
-
-#: templates/personal.php:22
-msgid "New password"
-msgstr ""
-
-#: templates/personal.php:23
-msgid "show"
-msgstr ""
-
-#: templates/personal.php:24
-msgid "Change password"
-msgstr ""
-
-#: templates/personal.php:30
-msgid "Email"
-msgstr ""
-
-#: templates/personal.php:31
-msgid "Your email address"
-msgstr ""
-
-#: templates/personal.php:32
-msgid "Fill in an email address to enable password recovery"
-msgstr ""
-
-#: templates/personal.php:38 templates/personal.php:39
-msgid "Language"
-msgstr ""
-
-#: templates/personal.php:44
-msgid "Help translate"
-msgstr ""
-
-#: templates/personal.php:51
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr ""
-
-#: templates/users.php:21 templates/users.php:76
-msgid "Name"
-msgstr ""
-
-#: templates/users.php:23 templates/users.php:77
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:26 templates/users.php:78 templates/users.php:98
-msgid "Groups"
+#: templates/personal.php:40
+msgid "Your password was changed"
 msgstr ""
 
-#: templates/users.php:32
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:50
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:64 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:81
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:83
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:101
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:103
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:107
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Ezeztatu"
+
+#: templates/personal.php:112
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:120 templates/personal.php:121
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:147
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:149
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:167
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:172
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:35
-msgid "Default Quota"
+#: templates/users.php:34
+msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:55 templates/users.php:138
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
+msgstr "Bestea"
+
+#: templates/users.php:85
+msgid "Username"
 msgstr ""
 
-#: templates/users.php:80 templates/users.php:112
-msgid "Group Admin"
+#: templates/users.php:92
+msgid "Storage"
 msgstr ""
 
-#: templates/users.php:82
-msgid "Quota"
+#: templates/users.php:106
+msgid "change full name"
 msgstr ""
 
-#: templates/users.php:146
-msgid "Delete"
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
 msgstr ""
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
index 2999d7de98..bbc3027bfc 100644
--- a/l10n/eu_ES/user_ldap.po
+++ b/l10n/eu_ES/user_ldap.po
@@ -6,165 +6,518 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:8
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:838
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:847
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:856
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:873 js/settings.js:882
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:876 js/settings.js:885
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:879
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:906
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:913
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:922
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:923
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:79 lib/wizard.php:93
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:122
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:784 lib/wizard.php:796
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:963
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr "Gorde"
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/part.wizard-server.php:31
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "Base DN"
+#: templates/part.wizard-server.php:36
+msgid "Port"
 msgstr ""
 
-#: templates/settings.php:9
-msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
-
-#: templates/settings.php:10
+#: templates/part.wizard-server.php:44
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/part.wizard-server.php:45
 msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/part.wizard-server.php:52
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/part.wizard-server.php:53
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
-msgid "User Login Filter"
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
 #, php-format
 msgid ""
-"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action."
+"The filter specifies which LDAP users shall have access to the %s instance."
 msgstr ""
 
-#: templates/settings.php:12
-#, php-format
-msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "User List Filter"
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "Defines the filter to apply, when retrieving users."
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
 msgstr ""
 
-#: templates/settings.php:13
-msgid "without any placeholder, e.g. \"objectClass=person\"."
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
 msgstr ""
 
 #: templates/settings.php:14
-msgid "Group Filter"
-msgstr ""
-
-#: templates/settings.php:14
-msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
-
-#: templates/settings.php:14
-msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
-
-#: templates/settings.php:17
-msgid "Port"
-msgstr ""
-
-#: templates/settings.php:18
-msgid "Base User Tree"
-msgstr ""
-
-#: templates/settings.php:19
-msgid "Base Group Tree"
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
 msgstr ""
 
 #: templates/settings.php:20
-msgid "Group-Member association"
-msgstr ""
-
-#: templates/settings.php:21
-msgid "Use TLS"
-msgstr ""
-
-#: templates/settings.php:21
-msgid "Do not use it for SSL connections, it will fail."
+msgid "Connection Settings"
 msgstr ""
 
 #: templates/settings.php:22
-msgid "Case insensitve LDAP server (Windows)"
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
 #: templates/settings.php:23
-msgid "Turn off SSL certificate validation."
+msgid "Backup (Replica) Host"
 msgstr ""
 
 #: templates/settings.php:23
 msgid ""
-"If connection only works with this option, import the LDAP server's SSL "
-"certificate in your ownCloud server."
-msgstr ""
-
-#: templates/settings.php:23
-msgid "Not recommended, use for testing only."
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
 msgstr ""
 
 #: templates/settings.php:24
-msgid "User Display Name Field"
-msgstr ""
-
-#: templates/settings.php:24
-msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgid "Backup (Replica) Port"
 msgstr ""
 
 #: templates/settings.php:25
-msgid "Group Display Name Field"
+msgid "Disable Main Server"
 msgstr ""
 
 #: templates/settings.php:25
-msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
 #: templates/settings.php:27
-msgid "in bytes"
+msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:27
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
 #: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
-msgid "Help"
+#: templates/settings.php:52
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:53
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:54
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:56
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:57
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:60
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/eu_ES/user_webdavauth.po b/l10n/eu_ES/user_webdavauth.po
new file mode 100644
index 0000000000..8de443590b
--- /dev/null
+++ b/l10n/eu_ES/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-01-27 08:22+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: eu_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 0aa0b374c6..f16b1d2870 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -73,131 +59,135 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "یکشنبه"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "دوشنبه"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "سه شنبه"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "پنجشنبه"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "جمعه"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "شنبه"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "ژانویه"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "فبریه"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "مارس"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "آوریل"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "می"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "ژوئن"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "جولای"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "آگوست"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "سپتامبر"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "اکتبر"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "نوامبر"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "دسامبر"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "در حال ذخیره سازی..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "ماه‌های قبل"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "سال‌های قبل"
 
@@ -264,6 +254,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "اشتراک گذاشته شده"
@@ -272,12 +282,12 @@ msgstr "اشتراک گذاشته شده"
 msgid "Share"
 msgstr "اشتراک‌گذاری"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "خطا"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "خطا درحال به اشتراک گذاشتن"
 
@@ -289,123 +299,123 @@ msgstr "خطا درحال لغو اشتراک"
 msgid "Error while changing permissions"
 msgstr "خطا در حال تغییر مجوز"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "به اشتراک گذاشته شده با شما توسط { دارنده}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
-msgstr ""
+msgstr "اشتراک گذاشتن لینک"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "نگهداری کردن رمز عبور"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "گذرواژه"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "اجازه آپلود عمومی"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "پیوند ایمیل برای شخص."
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "ارسال"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "تنظیم تاریخ انقضا"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "تاریخ انقضا"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "از طریق ایمیل به اشتراک بگذارید :"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "کسی یافت نشد"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "گروه"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "اشتراک گذاری مجدد مجاز نمی باشد"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "به اشتراک گذاشته شده در {بخش} با {کاربر}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "لغو اشتراک"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "می توان ویرایش کرد"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "کنترل دسترسی"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "ایجاد"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "به روز"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "پاک کردن"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "به اشتراک گذاشتن"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "نگهداری از رمز عبور"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "خطا در تنظیم نکردن تاریخ انقضا "
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "خطا در تنظیم تاریخ انقضا"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "درحال ارسال ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "ایمیل ارسال شد"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "اخطار"
 
@@ -452,11 +462,17 @@ msgstr "به روز رسانی ناموفق بود. لطفا این خطا را
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}"
@@ -476,8 +492,8 @@ msgstr "درخواست رد شده است !<br> آیا مطمئن هستید ک
 msgid "You will receive a link to reset your password via Email."
 msgstr "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "نام کاربری"
 
@@ -513,6 +529,18 @@ msgstr "گذرواژه جدید"
 msgid "Reset password"
 msgstr "دوباره سازی گذرواژه"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "شخصی"
@@ -521,7 +549,7 @@ msgstr "شخصی"
 msgid "Users"
 msgstr "کاربران"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "  برنامه ها"
 
@@ -631,49 +659,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "لطفا یک <strong> شناسه برای مدیر</strong> بسازید"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "پیشرفته"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "پوشه اطلاعاتی"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "پایگاه داده برنامه ریزی شدند"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "استفاده خواهد شد"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "شناسه پایگاه داده"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "پسورد پایگاه داده"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "نام پایگاه داده"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "جدول پایگاه داده"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "هاست پایگاه داده"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -689,7 +715,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "خروج"
 
@@ -715,27 +741,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "آیا گذرواژه تان را به یاد نمی آورید؟"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "بیاد آوری"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "ورود"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "ورود متناوب"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 9f8d9edde2..83011111fe 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# S. Wasim Tayyeb, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,280 +19,287 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "%s نمی تواند حرکت کند - در حال حاضر پرونده با این نام وجود دارد. "
+msgstr "%s نمی توان جابجا کرد - در حال حاضر پرونده با این نام وجود دارد. "
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "%s نمی تواند حرکت کند "
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "نام پرونده نمی تواند خالی باشد."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "قادر به تنظیم پوشه آپلود نمی باشد."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "رمز نامعتبر"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "هیچ فایلی آپلود نشد.خطای ناشناس"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "پرونده آپلود شده بیش ازدستور  ماکزیمم_حجم فایل_برای آپلود در   php.ini استفاده کرده است."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "هیچ پروندهای بارگذاری نشده"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "یک پوشه موقت گم شده"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "فضای کافی در دسترس نیست"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "فهرست راهنما نامعتبر می باشد."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "پرونده‌ها"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "فضای کافی در دسترس نیست"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. "
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{نام _جدید} در حال حاضر وجود دارد."
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "اشتراک‌گذاری"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "حذف قطعی"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "تغییرنام"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{نام_جدید} با { نام_قدیمی} جایگزین شد."
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
-msgstr[0] ""
+msgstr[0] "در حال بارگذاری %n فایل"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.'   یک نام پرونده نامعتبر است."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "دانلود شما در حال آماده شدن است. در صورتیکه پرونده ها بزرگ باشند ممکن است مدتی طول بکشد."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "خطا"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "نام"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "تاریخ"
 
@@ -299,12 +307,12 @@ msgstr "تاریخ"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s نمیتواند تغییر نام دهد."
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "بارگزاری"
 
@@ -340,72 +348,68 @@ msgstr "حداکثرمقدار برای بار گزاری پرونده های ف
 msgid "Save"
 msgstr "ذخیره"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "جدید"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "فایل متنی"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "پوشه جدید"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "پوشه"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "از پیوند"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "فایل های حذف شده"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "متوقف کردن بار گذاری"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "اینجا هیچ چیز نیست."
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "دانلود"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "سایز فایل برای آپلود زیاد است(م.تنظیمات در php.ini)"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "بهبود فایل سیستمی ذخیره گاه..."
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index 302940faf3..d649081bcf 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,18 +81,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "نیازمندی های گمشده"
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -100,9 +100,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "در حال ذخیره سازی..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index dc90b713f0..639992e119 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: miki_mika1362 <miki_mika1362@yahoo.com>\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "مجوز دسترسی صادر شد"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "خطا به هنگام تنظیم فضای دراپ باکس"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr " مجوز اعطا دسترسی"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "لطفا یک کلید و کد امنیتی صحیح دراپ باکس وارد کنید."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "خطا به هنگام تنظیم فضای Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "خطا: \"smbclient\" نصب نشده است. نصب و راه اندازی سهام  CIFS/SMB امکان پذیر نمیباشد. لطفا از مدیریت سازمان خود برای راه اندازی آن درخواست نمایید."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "خطا: پشتیبانی FTP در PHP فعال نمی باشد یا نصب نشده است. نصب و راه اندازی از سهم های FTP امکان پذیر نمی باشد. لطفا از مدیر سیستم خود برای راه اندازی آن درخواست\nکنید."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "کاربران"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "فعال سازی حافظه خارجی کاربر"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "اجازه به کاربران برای متصل کردن منابع ذخیره ی خارجی خودشان"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "گواهی های اصلی SSL "
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "وارد کردن گواهی اصلی"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index f14d78619a..192617a545 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 06:20+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "اشتراک گذارنده {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -54,32 +58,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%sپوشه %s را با شما به اشتراک گذاشت"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%sفایل %s را با شما به اشتراک گذاشت"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "دانلود"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "بارگزاری"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "متوقف کردن بار گذاری"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "هیچگونه پیش نمایشی موجود نیست"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/fa/files_trashbin.po b/l10n/fa/files_trashbin.po
index f986d7c13c..298294ab22 100644
--- a/l10n/fa/files_trashbin.po
+++ b/l10n/fa/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s را نمی توان برای همیشه حذف کرد"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "%s را نمی توان بازگرداند"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "فایل های حذف شده"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "خطا"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است."
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "نام"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "بازیابی"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "حذف شده"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "حذف"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "فایلهای حذف شده"
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index d33ebcdc1f..fa7f91fd3c 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "راه‌نما"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "شخصی"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "کاربران"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "مدیر"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -62,15 +62,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "سرویس های تحت وب در کنترل شما"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "دانلود به صورت فشرده غیر فعال است"
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "برنامه فعال نشده است"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "خطا در اعتبار سنجی"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "پرونده‌ها"
@@ -200,8 +199,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "شما نیاز به وارد کردن یک حساب کاربری موجود یا حساب مدیریتی دارید."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "نام کاربری و / یا رمزعبور MySQL  معتبر نیست."
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -228,21 +227,21 @@ msgstr "دستور متخلف عبارت است از: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "کاربرMySQL '%s'@'localhost' درحال حاضر موجود است."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "این کاربر را از MySQL حذف نمایید."
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "کاربر'%s'@'%%'  MySQL  در حال حاضر موجود است."
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "این کاربر را از MySQL حذف نمایید."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -269,62 +268,68 @@ msgstr "یک نام کاربری برای مدیر تنظیم نمایید."
 msgid "Set an admin password."
 msgstr "یک رمزعبور برای مدیر تنظیم نمایید."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s به اشتراک گذاشته شده است »%s« توسط شما"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "دسته بندی %s یافت نشد"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "امروز"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "دیروز"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "ماه قبل"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "سال قبل"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "سال‌های قبل"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index f24912b2a7..9161be26f7 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # miki_mika1362 <miki_mika1362@yahoo.com>, 2013
+# hajibaba <majid.hajibaba@gmail.com>, 2014
+# S. Wasim Tayyeb, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +20,48 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "ایمیل ارسال شد"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "رمزگذاری"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "قادر به بارگذاری لیست از فروشگاه اپ نیستم"
@@ -87,88 +131,116 @@ msgstr "برنامه را نمی توان به هنگام ساخت."
 
 #: changepassword/controller.php:20
 msgid "Wrong password"
-msgstr ""
+msgstr "رمز عبور اشتباه است"
 
 #: changepassword/controller.php:42
 msgid "No user supplied"
-msgstr ""
+msgstr "هیچ کاربری تعریف نشده است"
 
 #: changepassword/controller.php:74
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr ""
+msgstr "لطفاً یک رمز مدیریتی برای بازیابی کردن تعریف نمایید. در غیر اینصورت اطلاعات تمامی کاربران از دست خواهند رفت."
 
 #: changepassword/controller.php:79
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
-msgstr ""
+msgstr "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید."
 
 #: changepassword/controller.php:87
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
-msgstr ""
+msgstr "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمی‌کند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد."
 
 #: changepassword/controller.php:92 changepassword/controller.php:103
 msgid "Unable to change password"
+msgstr "نمی‌توان رمز را تغییر داد"
+
+#: js/admin.js:73
+msgid "Sending..."
 msgstr ""
 
-#: js/apps.js:43
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "مستندات کاربر"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "بهنگام شده به  {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "غیرفعال"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "فعال"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "لطفا صبر کنید ..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
-msgstr ""
+msgstr "خطا در هنگام غیر فعال سازی برنامه"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
-msgstr ""
+msgstr "خطا در هنگام فعال سازی برنامه"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "در حال بروز رسانی..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "خطا در هنگام بهنگام سازی برنامه"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "خطا"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "به روز رسانی"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "بروز رسانی انجام شد"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
+msgstr "انتخاب تصویر پروفایل"
+
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:266
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
-
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "در حال ذخیره سازی..."
+msgstr "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد."
 
 #: js/users.js:47
 msgid "deleted"
@@ -182,40 +254,40 @@ msgstr "بازگشت"
 msgid "Unable to remove user"
 msgstr "حذف کاربر امکان پذیر نیست"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "گروه ها"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "گروه مدیران"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "حذف"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "افزودن گروه"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "نام کاربری صحیح باید وارد شود"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "خطا در ایجاد کاربر"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "رمز عبور صحیح باید وارد شود"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
-msgstr ""
+msgstr "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در حال حاضر وجود دارد"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -239,208 +311,292 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "هیچ‌کدام"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "ورود"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "اخطار امنیتی"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
 "configure your webserver in a way that the data directory is no longer "
 "accessible or you move the data directory outside the webserver document "
 "root."
-msgstr ""
+msgstr "به احتمال زیاد پوشه‌ی data و فایل‌های شما از طریق اینترنت قابل دسترسی هستند. فایل .htaccess برنامه کار نمی‌کند. ما شدیداً توصیه می کنیم که شما وب سرور خودتان را طوری تنظیم کنید که پوشه‌ی data شما غیر قابل دسترسی باشد یا اینکه پوشه‌‎ی data را به خارج از ریشه‌ی اصلی وب سرور انتقال دهید."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "هشدار راه اندازی"
 
-#: templates/admin.php:53
+#: 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:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "ماژول 'fileinfo' از کار افتاده"
 
-#: templates/admin.php:68
+#: 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 از کار افتاده است.ما اکیدا توصیه می کنیم که این ماژول را فعال کنید تا نتایج بهتری به وسیله ی mime-type detection دریافت کنید."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "زبان محلی کار نمی کند."
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "اتصال اینترنت کار نمی کند"
 
-#: templates/admin.php:121
+#: 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 "
 "installation of 3rd party apps don´t work. Accessing files from remote and "
 "sending of notification emails might also not work. We suggest to enable "
 "internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "زمانبند"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "اجرای یک وظیفه با هر بار بارگذاری صفحه"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
-msgstr ""
+msgstr "cron.php در یک سرویس webcron ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr ""
+msgstr "از سرویس کرون سرور استفاده شده است که فایل cron.php را هر 15 دقیقه یک بار فراخوانی کند."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "اشتراک گذاری"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "فعال کردن API اشتراک گذاری"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "اجازه ی لینک ها"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
-msgstr ""
+msgstr "اجازه بارگذاری عمومی"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "به کاربران اجازه داده شود که امکان بارگذاری در پوشه هایی که بصورت عمومی به اشتراک گذاشته اند را برای سایرین فعال سازند"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "مجوز اشتراک گذاری مجدد"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "اجازه به کاربران برای اشتراک گذاری دوباره با آنها"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "اجازه به کابران برای اشتراک گذاری با همه"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
-msgstr ""
+msgstr "مجاز نمودن اطلاع رسانی توسط ایمیل"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "مجاز نمودن ارسال ایمیل توسط کاربر برای فایل‌های به اشتراک گذاشته شده"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "امنیت"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "وادار کردن HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
+msgstr "برای فعال سازی یا عدم فعال سازی اجبار استفاده از SSL، لطفاً از طریق HTTPS به %s وصل شوید."
+
+#: templates/admin.php:294
+msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "آدرس سرور"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "درگاه"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "اعتبارهای"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "سطح ورود"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "بیش‌تر"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "کم‌تر"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "نسخه"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +606,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "توسعه یافته به وسیله ی  <a href=\"http://ownCloud.org/contact\" target=\"_blank\">انجمن ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">کد اصلی</a> مجاز زیر گواهی <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "برنامه خود را بیافزایید"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "برنامه های بیشتر"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "یک برنامه انتخاب کنید"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "صفحه این اٌپ را در apps.owncloud.com ببینید"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-مجاز از طرف <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "مستندات کاربر"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "مستندات مدیر"
@@ -507,7 +667,7 @@ msgstr "راهبری کمکی اجرای اول را دوباره نمایش ب
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "گذرواژه"
 
@@ -519,151 +679,149 @@ msgstr "رمز عبور شما تغییر یافت"
 msgid "Unable to change your password"
 msgstr "ناتوان در تغییر گذرواژه"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "گذرواژه کنونی"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "گذرواژه جدید"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "تغییر گذر واژه"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
-msgstr ""
+msgstr "نام کامل"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "ایمیل"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "پست الکترونیکی شما"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "تصویر پروفایل"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
-msgstr ""
+msgstr "بارگذاری جدید"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
-msgstr ""
+msgstr "انتخاب جدید از میان فایل ها"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
-msgstr ""
+msgstr "تصویر پاک شود"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
+msgstr "هردوی jpg و png ها مربع گونه می‌باشند. با این حال شما می‌توانید آنها را برش بزنید."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "منصرف شدن"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
-msgstr ""
+msgstr "یک تصویر پروفایل انتخاب کنید"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "زبان"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "به ترجمه آن کمک کنید"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
-msgstr ""
+msgstr "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "رمزگذاری"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
-msgstr ""
+msgstr "رمز ورود"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
-msgstr ""
+msgstr "تمام فایلها رمزگشایی شود"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "نام کاربری"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "ایجاد کردن"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "مدیریت بازیابی رمز عبور"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "ذخیره سازی پیش فرض"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "نامحدود"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "دیگر"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "نام کاربری"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "حافظه"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "تنظیم کلمه عبور جدید"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "پیش فرض"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index d3a7150690..978827d9d5 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +87,43 @@ msgstr "موفقیت"
 msgid "Error"
 msgstr "خطا"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "تست اتصال با موفقیت انجام گردید"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "تست اتصال ناموفق بود"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "تایید حذف"
 
@@ -139,11 +139,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -161,7 +161,7 @@ msgstr "راه‌نما"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -197,7 +197,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -265,7 +265,7 @@ msgstr "شما می توانید پایه DN را برای کاربران و گ
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -408,41 +408,51 @@ msgstr "گروه صفات جستجو"
 msgid "Group-Member association"
 msgstr "انجمن گروه کاربران"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "ویژگی های مخصوص"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "سهمیه بندی انجام نشد."
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "سهمیه بندی پیش فرض"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "در بایت"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "ایمیل ارسال نشد."
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "قانون نامگذاری پوشه خانه کاربر"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "خالی گذاشتن برای نام کاربری (پیش فرض). در غیر این صورت، تعیین یک ویژگی LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "نام کاربری داخلی"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -458,15 +468,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "ویژگی نام کاربری داخلی:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "نادیده گرفتن تشخیص UUID "
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -477,19 +487,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "نام کاربری - نگاشت کاربر LDAP "
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -503,10 +513,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "پاک کردن نام کاربری- LDAP  نگاشت کاربر "
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "پاک کردن نام گروه -LDAP گروه نقشه برداری"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index c70d3fda2c..5a16422984 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# Jan-Erik Finlander <janerik.finlander@gmail.com>, 2014
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013-2014
 # ioxo <vahakangas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +20,11 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s jakoi kohteen »%s« kanssasi"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "Päättymispäivä on menneisyydessä."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s"
@@ -41,19 +41,6 @@ msgstr "Ylläpitotila laitettu pois päältä"
 msgid "Updated database"
 msgstr "Tietokanta ajan tasalla"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Päivitetään tiedostojen välimuistia, tämä saattaa kestää todella kauan..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Tiedostojen välimuisti päivitetty"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% valmis ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Kuvaa tai tiedostoa ei määritelty"
@@ -72,137 +59,141 @@ msgstr "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen"
 
 #: avatar/controller.php:135
 msgid "No crop data provided"
-msgstr ""
+msgstr "Puutteellinen tieto"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "sunnuntai"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "maanantai"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "tiistai"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "keskiviikko"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "torstai"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "perjantai"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "lauantai"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "tammikuu"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "helmikuu"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "maaliskuu"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "huhtikuu"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "toukokuu"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "kesäkuu"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "heinäkuu"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "elokuu"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "syyskuu"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "lokakuu"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "marraskuu"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "joulukuu"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Tallennetaan..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuutti sitten"
 msgstr[1] "%n minuuttia sitten"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n tunti sitten"
 msgstr[1] "%n tuntia sitten"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "tänään"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n päivä sitten"
 msgstr[1] "%n päivää sitten"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n kuukausi sitten"
 msgstr[1] "%n kuukautta sitten"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "vuotta sitten"
 
@@ -212,7 +203,7 @@ msgstr "Valitse"
 
 #: js/oc-dialogs.js:146
 msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Virhe ladatessa tiedostopohjia: {error}"
 
 #: js/oc-dialogs.js:172
 msgid "Yes"
@@ -268,7 +259,27 @@ msgstr "({count} valittu)"
 
 #: js/oc-dialogs.js:457
 msgid "Error loading file exists template"
-msgstr ""
+msgstr "Virhe ladatessa mallipohjaa"
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Erittäin heikko salasana"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Heikko salasana"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Kohtalainen salasana"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Hyvä salasana"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Vahva salasana"
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
@@ -278,12 +289,12 @@ msgstr "Jaettu"
 msgid "Share"
 msgstr "Jaa"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Virhe"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Virhe jaettaessa"
 
@@ -295,129 +306,129 @@ msgstr "Virhe jakoa peruttaessa"
 msgid "Error while changing permissions"
 msgstr "Virhe oikeuksia muuttaessa"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Jaettu sinun ja ryhmän {group} kanssa käyttäjän {owner} toimesta"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Jaettu kanssasi käyttäjän {owner} toimesta"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Jaa käyttäjän tai ryhmän kanssa…"
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Jaa linkki"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Salasana"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Salli julkinen lähetys"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Lähetä linkki sähköpostitse"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Lähetä"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Aseta päättymispäivä"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Päättymispäivä"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Jaa sähköpostilla:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Henkilöitä ei löytynyt"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "ryhmä"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Jakaminen uudelleen ei ole salittu"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "{item} on jaettu {user} kanssa"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "ilmoita sähköpostitse"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "voi muokata"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "Pääsyn hallinta"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "luo"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "päivitä"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "poista"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "jaa"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Salasanasuojattu"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa eräpäivää"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Virhe päättymispäivää asettaessa"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Lähetetään..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Sähköposti lähetetty"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Varoitus"
 
 #: js/tags.js:4
 msgid "The object type is not specified."
-msgstr ""
+msgstr "The object type is not specified."
 
 #: js/tags.js:13
 msgid "Enter new"
@@ -437,7 +448,7 @@ msgstr "Muokkaa tunnisteita"
 
 #: js/tags.js:57
 msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "Virhe ladatessa keskustelupohja: {error}"
 
 #: js/tags.js:261
 msgid "No tags selected for deletion."
@@ -458,11 +469,17 @@ msgstr "Päivitys epäonnistui. Ilmoita ongelmasta <a href=\"https://github.com/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s salasanan nollaus"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Sähköpostia lähettäessä tapahtui virhe, ota yhteys järjestelmän ylläpitäjään."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}"
@@ -482,8 +499,8 @@ msgstr "Pyyntö epäonnistui!<br>Olihan sähköpostiosoitteesi/käyttäjätunnuk
 msgid "You will receive a link to reset your password via Email."
 msgstr "Saat sähköpostitse linkin nollataksesi salasanan."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
@@ -519,6 +536,18 @@ msgstr "Uusi salasana"
 msgid "Reset password"
 msgstr "Palauta salasana"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Henkilökohtainen"
@@ -527,7 +556,7 @@ msgstr "Henkilökohtainen"
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Sovellukset"
 
@@ -553,19 +582,19 @@ msgstr "Virhe tunnisteita poistaessa"
 
 #: tags/controller.php:75
 msgid "Error tagging"
-msgstr ""
+msgstr "Tunnisteiden kirjoitusvirhe"
 
 #: tags/controller.php:86
 msgid "Error untagging"
-msgstr ""
+msgstr "Tunisteiden poisto virhe"
 
 #: tags/controller.php:97
 msgid "Error favoriting"
-msgstr ""
+msgstr "Suosituksen kirjoitusvirhe"
 
 #: tags/controller.php:108
 msgid "Error unfavoriting"
-msgstr ""
+msgstr "Suosituksen poisto virhe"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -592,7 +621,7 @@ msgstr "Jakaminen päättyy %s."
 
 #: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
-msgstr ""
+msgstr "Kippis!"
 
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
@@ -618,7 +647,7 @@ msgstr "Turvallista satunnaislukugeneraattoria ei ole käytettävissä, ota käy
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "Ilman turvallinen satunnaislukugeneraattori, hyökkääjä saattaa pystyä ennustamaan salasanan tunnuksineen ja ottaa tilisi."
 
 #: templates/installation.php:40
 msgid ""
@@ -637,49 +666,47 @@ msgstr "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a
 msgid "Create an <strong>admin account</strong>"
 msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Lisäasetukset"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Tallennus ja tietokanta"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datakansio"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Muokkaa tietokantaa"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "käytetään"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Tietokannan käyttäjä"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Tietokannan salasana"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Tietokannan nimi"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tietokannan taulukkotila"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Tietokantapalvelin"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Valmistellaan…"
 
@@ -695,7 +722,7 @@ msgstr "Tämä sovellus vaatii toimiakseen JavaScriptin käyttöä. <a href=\"ht
 msgid "%s is available. Get more information on how to update."
 msgstr "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
@@ -721,28 +748,28 @@ msgstr "Palvelimen puoleinen tunnistautuminen epäonnistui!"
 msgid "Please contact your administrator."
 msgstr "Ota yhteys ylläpitäjään."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Unohditko salasanasi?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "muista"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Vaihtoehtoiset kirjautumiset"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hei sinä!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Tutustu siihen!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Hei!<br><br>%s jakoi kanssasi kohteen <strong>%s</strong>.<br><a href=\"%s\">Tutustu siihen!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 87ec5b64f6..8306890140 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013-2014
+# nahka <nahkaz@gmail.com>, 2014
 # ioxo <vahakangas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,283 +20,290 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Kohteen %s siirto ei onnistunut"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Tiedoston nimi ei voi olla tyhjä."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Tiedoston nimessä ei saa olla merkkiä \"/\". Valitse toinen nimi."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" on virheellinen tiedostonimi."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "Kohdekansio on siirretty tai poistettu."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Nimi %s on jo käytössä kansiossa %s. Valitse toinen nimi."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Virheellinen lähde"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Palvelimen ei ole lupa avata verkko-osoitteita. Tarkista palvelimen asetukset"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Virhe ladatessa kohdetta %s sijaintiin %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Virhe tiedostoa luotaessa"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Kansion nimi ei voi olla tyhjä."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Kansion nimessä ei saa olla merkkiä \"/\". Valitse toinen nimi."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Virhe kansiota luotaessa"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
-msgstr ""
+msgstr "Lähetyskansion asettaminen epäonnistui."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lähetetty. Tuntematon virhe"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Ei virheitä, tiedosto lähetettiin onnistuneesti"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Lähetettävän tiedoston enimmäiskoko ylittää HTML-lomakkeessa määritellyn MAX_FILE_SIZE-säännön"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Tiedoston lähetys onnistui vain osittain"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Yhtäkään tiedostoa ei lähetetty"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Tilapäiskansio puuttuu"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Levylle kirjoitus epäonnistui"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Tallennustilaa ei ole riittävästi käytettävissä"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Tiedostot"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Tilaa ei ole riittävästi"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Yhteiskoko {size1} ylittää lähetysrajan {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Tuloksien saaminen palvelimelta ei onnistunut."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "Osoite ei voi olla tyhjä"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Tiedoston luominen epäonnistui"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Kansion luominen epäonnistui"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Virhe noutaessa verkko-osoitetta"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Jaa"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Poista pysyvästi"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Tiedoston nimeäminen uudelleen epäonnistui"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Virhe tiedostoa poistaessa."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n kansio"
 msgstr[1] "%n kansiota"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n tiedosto"
 msgstr[1] "%n tiedostoa"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} ja {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Lähetetään %n tiedosto"
 msgstr[1] "Lähetetään %n tiedostoa"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' on virheellinen nimi tiedostolle."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" on virheellinen tiedostonimi."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuina. Siirry henkilökohtaisiin asetuksiin avataksesi tiedostojesi salauksen."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Lataustasi valmistellaan. Tämä saattaa kestää hetken, jos tiedostot ovat suuria kooltaan."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Virhe tiedostoa siirrettäessä"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Virhe"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Muokattu"
 
@@ -303,12 +311,12 @@ msgstr "Muokattu"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Virheellinen kansion nimi. 'Shared':n käyttö on varattu."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "kohteen %s nimeäminen uudelleen epäonnistui"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Lähetä"
 
@@ -344,72 +352,68 @@ msgstr "ZIP-tiedostojen enimmäiskoko"
 msgid "Save"
 msgstr "Tallenna"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Uusi"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Uusi tekstitiedosto"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Tekstitiedosto"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Uusi kansio"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Kansio"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Linkistä"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Poistetut tiedostot"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Peru lähetys"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Käyttöoikeutesi eivät riitä tiedostojen lähettämiseen tai kansioiden luomiseen tähän sijaintiin"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Lähetettävä tiedosto on liian suuri"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Päivitetään tiedostojärjestelmän välimuistia..."
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index e4e35b2150..c9a41514ac 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -5,13 +5,14 @@
 # Translators:
 # muro <janne.morsky@metropolia.fi>, 2013
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# nahka <nahkaz@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +48,7 @@ msgstr "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin."
 
 #: ajax/updatePrivateKeyPassword.php:52
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Yksityisen avaimen salasana päivitetty onnistuneesti."
 
 #: ajax/updatePrivateKeyPassword.php:54
 msgid ""
@@ -82,18 +83,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Seuraavat käyttäjät eivät ole määrittäneet salausta:"
 
@@ -101,9 +102,9 @@ msgstr "Seuraavat käyttäjät eivät ole määrittäneet salausta:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Tallennetaan..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 0813c9ede0..920aee5528 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 12:50+0000\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +18,44 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Pääsy sallittu"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Virhe Dropbox levyn asetuksia tehtäessä"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Salli pääsy"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Virhe Google Drive levyn asetuksia tehtäessä"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Tallennettu"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Varoitus:</b> \"smbclient\" ei ole asennettuna. CIFS-/SMB-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan smbclient."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Varoitus:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. FTP-jakojen liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +107,22 @@ msgid "Users"
 msgstr "Käyttäjät"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Ota käyttöön ulkopuoliset tallennuspaikat"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Salli käyttäjien liittää omia erillisiä tallennusvälineitä"
+msgid "Allow users to mount the following external storage"
+msgstr "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL-juurivarmenteet"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Tuo juurivarmenne"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 046e8cf960..8304b934d1 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 12:50+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Jakanut {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Tämä jako on suojattu salasanalla"
@@ -54,32 +58,16 @@ msgstr "jakaminen on poistettu käytöstä"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Kysy lisätietoja henkilöltä, jolta sait linkin."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s jakoi kansion %s kanssasi"
+msgid "shared by %s"
+msgstr "jakanut %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s jakoi tiedoston %s kanssasi"
+msgid "Download %s"
+msgstr "Lataa %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Lataa"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Lähetä"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Peru lähetys"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Ei esikatselua kohteelle"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Suora linkki"
diff --git a/l10n/fi_FI/files_trashbin.po b/l10n/fi_FI/files_trashbin.po
index 55da622da0..d80adb6e8a 100644
--- a/l10n/fi_FI/files_trashbin.po
+++ b/l10n/fi_FI/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kohdetta %s ei voitu poistaa pysyvästi"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Kohteen %s palautus epäonnistui"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Poistetut tiedostot"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Virhe"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "palautettu"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Tyhjää täynnä! Roskakorissa ei ole mitään."
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Palauta"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Poistettu"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Poistetut tiedostot"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index fa1f6eebd0..3091572a28 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 13:00+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Sovellusta \"%s\" ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Sovelluksen nimeä ei määritelty"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Ohje"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Asetukset"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Ylläpitäjä"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Kohteen \"%s\" päivitys epäonnistui."
@@ -62,15 +62,10 @@ msgstr "Tuntematon tiedostotyyppi"
 msgid "Invalid image"
 msgstr "Virheellinen kuva"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP-lataus on poistettu käytöstä."
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Lähdettä ei määritelty sovellusta asennettaessa"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Href-määritettä ei asetettu asennettaessa sovellusta http:n yli"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Tyypin %s arkistot eivät ole tuettuja"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Pakettitiedoston avaaminen epäonnistui sovellusta asennettaessa"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Sovellus ei sisällä info.xml-tiedostoa"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Sovelluskansio on jo olemassa"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Sovellusta ei ole otettu käyttöön"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Tunnistautumisvirhe"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Valtuutus vanheni. Lataa sivu uudelleen."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Tuntematon käyttäjä"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Tiedostot"
@@ -200,8 +199,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL:n käyttäjätunnus ja/tai salasana on väärin"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "MySQL/MariaDB-käyttäjätunnus ja/tai salasana on virheellinen"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -228,21 +227,21 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL-käyttäjä '%s'@'localhost' on jo olemassa."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "MySQL/MariaDB-käyttäjä '%s'@'localhost' on jo olemassa."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Pudota tämä käyttäjä MySQL:stä"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Pudota tämä käyttäjä MySQL/MariaDB:stä"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL-käyttäjä '%s'@'%%' on jo olemassa"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "MySQL/MariaDB-käyttäjä '%s'@'%%' on jo olemassa"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Pudota tämä käyttäjä MySQL:stä."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Pudota tämä käyttäjä MySQL/MariaDB:stä."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -269,66 +268,72 @@ msgstr "Aseta ylläpitäjän käyttäjätunnus."
 msgid "Set an admin password."
 msgstr "Aseta ylläpitäjän salasana."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lue tarkasti <a href='%s'>asennusohjeet</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s jakoi kohteen »%s« kanssasi"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Luokkaa \"%s\" ei löytynyt"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuutti sitten"
 msgstr[1] "%n minuuttia sitten"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n tunti sitten"
 msgstr[1] "%n tuntia sitten"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "tänään"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "eilen"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n päivä sitten"
 msgstr[1] "%n päivää sitten"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "viime kuussa"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n kuukausi sitten"
 msgstr[1] "%n kuukautta sitten"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "viime vuonna"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "vuotta sitten"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index d06a815707..820800fa81 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-05 22:23-0500\n"
-"PO-Revision-Date: 2013-12-05 06:30+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 07:01+0000\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Virheellinen arvo kohdassa %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Tallennettu"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "testaa sähköpostiasetukset"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Sähköposti lähetetty"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Lähetystila"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Salaus"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Tunnistautumistapa"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)"
@@ -114,62 +156,90 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Salasanan vaihto ei onnistunut"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Lähetetään..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Käyttäjäohjeistus"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Ylläpitäjän ohjeistus"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Päivitä versioon {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Poista käytöstä"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Käytä"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Odota hetki..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Virhe poistaessa sovellusta käytöstä"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Virhe ottaessa sovellusta käyttöön"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Päivitetään..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Virhe sovellusta päivittäessä"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Virhe"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Päivitä"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Päivitetty"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Valitse profiilikuva"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Erittäin heikko salasana"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Heikko salasana"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Kohtalainen salasana"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Hyvä salasana"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Vahva salasana"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Tallennetaan..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "poistettu"
@@ -182,40 +252,40 @@ msgstr "kumoa"
 msgid "Unable to remove user"
 msgstr "Käyttäjän poistaminen ei onnistunut"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Ryhmän ylläpitäjä"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Poista"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "lisää ryhmä"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Anna kelvollinen käyttäjätunnus"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Virhe käyttäjää luotaessa"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Anna kelvollinen salasana"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "_kielen_nimi_"
 
@@ -239,18 +309,42 @@ msgstr "Virheet ja vakavat ongelmat"
 msgid "Fatal issues only"
 msgstr "Vain vakavat ongelmat"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ei mitään"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Kirjaudu"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Turvallisuusvaroitus"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Asetusvaroitus"
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Lue <a href=\"%s\">asennusohjeet</a> tarkasti."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Moduuli 'fileinfo' puuttuu"
 
-#: templates/admin.php:68
+#: 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 "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Käytössä oleva PHP-versio on vanhentunut"
 
-#: templates/admin.php:82
+#: 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 "Käytössä oleva PHP on vanhentunut. Päivitä versioon 5.3.8 tai uudempaan, koska aiemmat versiot eivät ole toimivia. On mahdollista, että tämä ownCloud-asennus ei toimi kunnolla."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Maa-asetus ei toimi"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia."
 
-#: templates/admin.php:106
+#: 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 ""
+msgstr "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Internet-yhteys ei toimi"
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Viimeisin cron suoritettiin %s."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cronia ei suoritettu vielä!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumiseen 15 minuutin välein"
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Jakaminen"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Käytä jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Salli linkit"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Salli käyttäjien jakaa kohteita käyttäen linkkejä"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Salli julkiset lähetykset"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Salli uudelleenjakaminen"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Mahdollistaa käyttäjien jakavan uudelleen heidän kanssaan jaettuja kohteita"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Salli käyttäjien jakaa kenen tahansa kanssa"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Salli jakaminen vain samoissa ryhmissä olevien käyttäjien kesken"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Salli sähköposti-ilmoitukset"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Salli käyttäjien lähettää sähköposti-ilmoituksia jaetuista tiedostoista"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Tietoturva"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Pakota HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Sähköpostipalvelin"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Tätä käytetään ilmoitusten lähettämiseen."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Lähettäjän osoite"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Tunnistautuminen vaaditaan"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Palvelimen osoite"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Portti"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Tilitiedot"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "SMTP-käyttäjätunnus"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "SMTP-salasana"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Testaa sähköpostiasetukset"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Lähetä sähköpostiviesti"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Lokitaso"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Enemmän"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Vähemmän"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versio"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +604,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Lisää sovelluksesi"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Lisää sovelluksia"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Valitse sovellus"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Ohjeistus:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Katso sovellussivu osoitteessa apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Lue lisää sovelluksen sivustolta"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Käyttäjäohjeistus"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Ylläpito-ohjeistus"
@@ -507,7 +665,7 @@ msgstr "Näytä ensimmäisen käyttökerran avustaja uudelleen"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Salasana"
 
@@ -519,151 +677,149 @@ msgstr "Salasanasi vaihdettiin"
 msgid "Unable to change your password"
 msgstr "Salasanaasi ei voitu vaihtaa"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Sähköpostiosoite"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Sähköpostiosoitteesi"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa ja voit vastaanottaa ilmoituksia"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profiilikuva"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Lähetä uusi"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Valitse uusi tiedostoista"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Poista kuva"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Keskeytä"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Peru"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Valitse profiilikuvaksi"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Kieli"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Auta kääntämisessä"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Salaus"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Pura kaikkien tiedostojen salaus"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Kirjautumisnimi"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Luo"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Oletustallennustila"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
-msgstr ""
+msgstr "Määritä tallennustilan kiintiö (esim. \"512 MB\" tai \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Rajoittamaton"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Tallennustila"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "muuta koko nimi"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "aseta uusi salasana"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Oletus"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index fbdfcd5cd6..83464ec111 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "Onnistui!"
 msgid "Error"
 msgstr "Virhe"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Valitse ryhmät"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Yhteystesti onnistui"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Yhteystesti epäonnistui"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Vahvista poisto"
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "Ohje"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished na
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "tavuissa"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Sähköpostikenttä"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 29d5bd0216..ac43181e22 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
-# Christophe Lherieau <skimpax@gmail.com>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
 # msoko <sokolovitch@yahoo.com>, 2013
 # ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,12 +25,11 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s partagé »%s« avec vous"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Impossible d'envoyer un mail aux utilisateurs suivant : %s"
@@ -47,19 +46,6 @@ msgstr "Basculé en mode production (non maintenance)"
 msgid "Updated database"
 msgstr "Base de données mise à jour"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "En cours de mise à jour de cache de fichiers. Cette opération peut être très longue..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Cache de fichier mis à jour"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% effectué ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Aucune image ou fichier fourni"
@@ -80,135 +66,139 @@ msgstr "Aucune image temporaire disponible pour le profil. Essayez à nouveau."
 msgid "No crop data provided"
 msgstr "Aucune donnée de culture fournie"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Lundi"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Vendredi"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Samedi"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "janvier"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "février"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "mars"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "avril"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "juin"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "juillet"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "août"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "septembre"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "octobre"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "novembre"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "décembre"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Enregistrement..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "il y a %n minute"
 msgstr[1] "il y a %n minutes"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Il y a %n heure"
 msgstr[1] "Il y a %n heures"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "il y a %n jour"
 msgstr[1] "il y a %n jours"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Il y a %n mois"
 msgstr[1] "Il y a %n mois"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "il y a plusieurs mois"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "l'année dernière"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "il y a plusieurs années"
 
@@ -276,6 +266,26 @@ msgstr "({count} sélectionnés)"
 msgid "Error loading file exists template"
 msgstr "Erreur de chargement du modèle de fichier existant"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Mot de passe de très faible sécurité"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Mot de passe de faible sécurité"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Mot de passe de sécurité tout juste acceptable"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Mot de passe de sécurité suffisante"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Mot de passe de forte sécurité"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Partagé"
@@ -284,12 +294,12 @@ msgstr "Partagé"
 msgid "Share"
 msgstr "Partager"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Erreur"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
@@ -301,123 +311,123 @@ msgstr "Erreur lors de l'annulation du partage"
 msgid "Error while changing permissions"
 msgstr "Erreur lors du changement des permissions"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Partagé par {owner} avec vous et le groupe {group}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Partagé avec vous par {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Partager avec un utilisateur ou un groupe..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Partager le lien"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Protéger par un mot de passe"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Mot de passe"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Autoriser l'upload par les utilisateurs non enregistrés"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Envoyez le lien par email"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Envoyer"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Spécifier la date d'expiration"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Partager via e-mail :"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Aucun utilisateur trouvé"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "groupe"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Le repartage n'est pas autorisé"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Partagé dans {item} avec {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "Notifier par email"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "édition autorisée"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "contrôle des accès"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "créer"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "mettre à jour"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "supprimer"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "partager"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protégé par un mot de passe"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spécification de la date d'expiration"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email envoyé"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Attention"
 
@@ -464,11 +474,17 @@ msgstr "La mise à jour a échoué. Veuillez signaler ce problème à la <a href
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "La mise à jour a réussi. Vous êtes redirigé maintenant vers ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "Réinitialisation de votre mot de passe %s"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez contacter votre administrateur."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}"
@@ -488,8 +504,8 @@ msgstr "Requête en échec!<br>Avez-vous vérifié vos courriel/nom d'utilisateu
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
@@ -525,6 +541,18 @@ msgstr "Nouveau mot de passe"
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personnel"
@@ -533,7 +561,7 @@ msgstr "Personnel"
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Applications"
 
@@ -643,49 +671,47 @@ msgstr "Pour les informations de configuration de votre serveur, veuillez lire l
 msgid "Create an <strong>admin account</strong>"
 msgstr "Créer un <strong>compte administrateur</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avancé"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Support de stockage & base de données"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Répertoire des données"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configurer la base de données"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "sera utilisé"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Utilisateur pour la base de données"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Mot de passe de la base de données"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nom de la base de données"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tablespaces de la base de données"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Serveur de la base de données"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "En cours de finalisation..."
 
@@ -701,7 +727,7 @@ msgstr "Cette application nécessite que JavaScript soit activé pour fonctionne
 msgid "%s is available. Get more information on how to update."
 msgstr "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Se déconnecter"
 
@@ -727,28 +753,28 @@ msgstr "L'authentification côté serveur a échoué !"
 msgid "Please contact your administrator."
 msgstr "Veuillez contacter votre administrateur."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Mot de passe perdu ?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "se souvenir de moi"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Connexion"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Logins alternatifs"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Bonjour,<br><br>Nous vous informons que %s a partagé »%s« avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Bonjour,<br><br>Juste pour vous informer que %s a partagé <strong>%s</strong> avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index c6057d1fd5..9e3b0bca46 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -4,17 +4,17 @@
 # 
 # Translators:
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
-# Christophe Lherieau <skimpax@gmail.com>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
-# MathieuP <mathieu.payrol@gmail.com>, 2013
+# MathieuP, 2013
 # ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 14:30+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,283 +22,290 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Impossible de déplacer %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Le nom de fichier ne peut être vide."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Le nom de fichier ne doit pas contenir \"/\". Merci de choisir un nom différent."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" n'est pas un nom de fichier valide."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "Le dossier cible a été déplacé ou supprimé."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Le nom %s est déjà utilisé dans le dossier %s. Merci de choisir un nom différent."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "La source n'est pas valide"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Le serveur n'est pas autorisé à ouvrir des URL, veuillez vérifier la configuration du serveur"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Erreur pendant le téléchargement de %s à %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Erreur pendant la création du fichier"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Le nom de dossier ne peux pas être vide."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Le nom de dossier ne doit pas contenir \"/\". Merci de choisir un nom différent."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Erreur pendant la création du dossier"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Impossible de définir le dossier pour l'upload, charger."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Jeton non valide"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Aucun fichier n'a été envoyé. Erreur inconnue"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Aucune erreur, le fichier a été envoyé avec succès."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier n'a été que partiellement envoyé."
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Pas de fichier envoyé."
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Absence de dossier temporaire."
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Erreur d'écriture sur le disque"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Plus assez d'espace de stockage disponible"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "L'envoi a échoué. Impossible d'obtenir les informations du fichier."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "L'envoi a échoué. Impossible de trouver le fichier envoyé."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "L'envoi a échoué. Impossible d'obtenir les informations du fichier."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Fichiers"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Espace disponible insuffisant"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Espace insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Envoi annulé."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Ne peut recevoir les résultats du serveur."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "L'URL ne peut pas être vide"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Dans le dossier home, 'Partagé' est un nom de fichier réservé"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} existe déjà"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Impossible de créer le fichier"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Impossible de créer le dossier"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Erreur d'accès à l'URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Partager"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Supprimer de façon définitive"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "En attente"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Impossible de renommer le fichier"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} a été remplacé par {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Erreur pendant la suppression du fichier."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dossier"
 msgstr[1] "%n dossiers"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fichier"
 msgstr[1] "%n fichiers"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} et {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Téléversement de %n fichier"
 msgstr[1] "Téléversement de %n fichiers"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' n'est pas un nom de fichier valide."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" n'est pas un nom de fichier valide."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "L'application de chiffrement est activée mais vos clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Votre clef privée pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Votre téléchargement est cours de préparation. Ceci peut nécessiter un certain temps si les fichiers sont volumineux."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Erreur lors du déplacement du fichier"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Erreur"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modifié"
 
@@ -306,12 +313,12 @@ msgstr "Modifié"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nom de dossier invalide. L'utilisation du mot 'Shared' est réservée."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ne peut être renommé"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Envoyer"
 
@@ -347,72 +354,68 @@ msgstr "Taille maximale pour les fichiers ZIP"
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nouveau"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Nouveau fichier texte"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Fichier texte"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Depuis le lien"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Fichiers supprimés"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Télécharger"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Téléversement trop volumineux"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Analyse en cours"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Mise à niveau du cache du système de fichier"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index 8fe287b228..a780215e4d 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
-# Christophe Lherieau <skimpax@gmail.com>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
 # froozeify <froozeify@mail.com>, 2013
 # lyly95, 2013
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-12-02 20:30+0000\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
+"PO-Revision-Date: 2014-03-13 15:59+0000\n"
 "Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -86,18 +86,18 @@ msgid ""
 "administrator"
 msgstr "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter votre administrateur."
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Système minimum requis non respecté."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :"
 
@@ -105,9 +105,9 @@ msgstr "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Enregistrement..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Chiffrement initial en cours... Veuillez re-essayer ultérieurement."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 7eb1176ba8..975c937c62 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Christophe Lherieau <skimpax@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
+"PO-Revision-Date: 2014-03-13 15:59+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +18,44 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Accès autorisé"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Erreur lors de la configuration du support de stockage Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Autoriser l'accès"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Erreur lors de la configuration du support de stockage Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Sauvegarder"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Attention : </b> \"smbclient\" n'est pas installé. Le montage des partages CIFS/SMB n'est pas disponible. Contactez votre administrateur système pour l'installer."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Attention : </b> Le support FTP de PHP n'est pas activé ou installé. Le montage des partages FTP n'est pas disponible. Contactez votre administrateur système pour l'installer."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +107,22 @@ msgid "Users"
 msgstr "Utilisateurs"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Activer le stockage externe pour les utilisateurs"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Autoriser les utilisateurs à monter leur propre stockage externe"
+msgid "Allow users to mount the following external storage"
+msgstr "Autorise les utilisateurs à monter les stockage externes suivants"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Certificats racine SSL"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importer un certificat racine"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 3dbac303a0..c7044e066f 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -5,14 +5,14 @@
 # Translators:
 # square <benben390-390@yahoo.fr>, 2013
 # Christophe Lherieau <skimpax@gmail.com>, 2013
-# etiess <etiess@gmail.com>, 2013
+# etiess <etiess@gmail.com>, 2013-2014
 # ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 14:30+0000\n"
+"POT-Creation-Date: 2014-03-13 01:55-0400\n"
+"PO-Revision-Date: 2014-03-12 19:40+0000\n"
 "Last-Translator: etiess <etiess@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,10 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Partagé par {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Ce partage est protégé par un mot de passe"
@@ -57,32 +61,16 @@ msgstr "le partage est désactivé"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s a partagé le répertoire %s avec vous"
+msgid "shared by %s"
+msgstr "partagé par %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s a partagé le fichier %s avec vous"
+msgid "Download %s"
+msgstr "Télécharger %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Télécharger"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Envoyer"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Annuler l'envoi"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Pas d'aperçu disponible pour"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Lien direct"
diff --git a/l10n/fr/files_trashbin.po b/l10n/fr/files_trashbin.po
index 351fde9dda..a484716b9b 100644
--- a/l10n/fr/files_trashbin.po
+++ b/l10n/fr/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Impossible d'effacer %s de façon permanente"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Impossible de restaurer %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Fichiers supprimés"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Erreur"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "restauré"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Il n'y a rien ici. Votre corbeille est vide !"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nom"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Restaurer"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Effacé"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Fichiers effacés"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index a0d3113e8e..32cac2cbdb 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Lherieau <skimpax@gmail.com>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # Cyril Glapa <kyriog@gmail.com>, 2013
 # etiess <etiess@gmail.com>, 2013
 # ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
+"PO-Revision-Date: 2014-03-13 15:59+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,38 +21,38 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "L'application \"%s\" ne peut être installée car elle n'est pas compatible avec cette version de ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Aucun nom d'application spécifié"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Aide"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personnel"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Paramètres"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administration"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Echec de la mise à niveau \"%s\"."
@@ -65,15 +65,10 @@ msgstr "Type de fichier inconnu"
 msgid "Invalid image"
 msgstr "Image invalide"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "impossible d'ouvrir \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Téléchargement ZIP désactivé."
@@ -96,74 +91,78 @@ msgid ""
 "administrator."
 msgstr "Merci de télécharger les fichiers séparément en parties plus petites, ou demandez aimablement à votre administrateur."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Aucune source spécifiée pour installer l'application"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Aucun href spécifié pour installer l'application par http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Aucun chemin spécifié pour installer l'application depuis un fichier local"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Les archives de type %s ne sont pas supportées"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Échec de l'ouverture de l'archive lors de l'installation de l'application"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "L'application ne fournit pas de fichier info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "L'application ne peut être installée car elle contient du code non-autorisé"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non-diffusées"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "L'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Le dossier de l'application existe déjà"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Impossible de créer le dossier de l'application. Corrigez les droits d'accès. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "L'application n'est pas activée"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Erreur d'authentification"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "La session a expiré. Veuillez recharger la page."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Utilisateur inconnu"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Fichiers"
@@ -197,23 +196,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %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 "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "Nom d'utilisateur et/ou mot de passe MySQL/MariaDB invalide"
 
 #: 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 "Erreur de la base de données : \"%s\""
@@ -222,30 +221,30 @@ msgstr "Erreur de la base de données : \"%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 "La requête en cause est : \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "L'utilisateur MySQL '%s'@'localhost' existe déjà."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "L'utilisateur MySQL/MariaDB '%s'@'localhost' existe déjà."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Retirer cet utilisateur de la base MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Retirer cet utilisateur de la base MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "L'utilisateur MySQL '%s'@'%%' existe déjà"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "L'utilisateur MySQL/MariaDB '%s'@'%%' existe déjà"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Retirer cet utilisateur de la base MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Retirer cet utilisateur de la base MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -260,7 +259,7 @@ msgstr "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "La requête en cause est : \"%s\", nom : %s, mot de passe : %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'utilisateur et/ou mot de passe de la base PostgreSQL invalide"
 
@@ -272,66 +271,72 @@ msgstr "Spécifiez un nom d'utilisateur pour l'administrateur."
 msgid "Set an admin password."
 msgstr "Spécifiez un mot de passe administrateur."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Veuillez vous référer au <a href='%s'>guide d'installation</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s partagé »%s« avec vous"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Impossible de trouver la catégorie \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "il y a %n minutes"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "Il y a %n heures"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "aujourd'hui"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "hier"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "il y a %n jours"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "le mois dernier"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "Il y a %n mois"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "l'année dernière"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "il y a plusieurs années"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index d0edd3b5c4..1b65d2d0a4 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -3,21 +3,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# 2rock <hub2rock@free.fr>, 2014
 # Adalberto Rodrigues <rodrigues_adalberto@yahoo.fr>, 2013
-# Christophe Lherieau <skimpax@gmail.com>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
 # lyly95, 2013
 # Mystyle <maelvstyle@gmail.com>, 2013
 # ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013
 # red0ne <red-0ne@smarty-concept.com>, 2013
 # RyDroid <rydroid_trans@yahoo.fr>, 2013
+# tcit <thomas.citharet@gmail.com>, 2014
+# PVince81 <PVince81@owncloud.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-18 10:30+0000\n"
-"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,6 +28,48 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Type de valeur METADATA invalide : \"%s\"."
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Sauvegarder"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "tester les paramètres d'e-mail"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Si vous recevez cet email, c'est que les paramètres sont corrects"
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email envoyé"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Mode d'envoi"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Chiffrement"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Méthode d'authentification"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Impossible de charger la liste depuis l'App Store"
@@ -121,62 +166,90 @@ msgstr "L'infrastructure d'arrière-plan ne supporte pas la modification de mot
 msgid "Unable to change password"
 msgstr "Impossible de modifier le mot de passe"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Envoi en cours..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Documentation utilisateur"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Documentation administrateur"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Mettre à jour vers {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Désactiver"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Activer"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Veuillez patienter…"
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Erreur lors de la désactivation de l'application"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Erreur lors de l'activation de l'application"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Mise à jour..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Erreur lors de la mise à jour de l'application"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Erreur"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Mise à jour effectuée avec succès"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Selectionner une photo de profil "
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Mot de passe de très faible sécurité"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Mot de passe de faible sécurité"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Mot de passe de sécurité tout juste acceptable"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Mot de passe de sécurité suffisante"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Mot de passe de forte sécurité"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Déchiffrement en cours... Cela peut prendre un certain temps."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Enregistrement..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "supprimé"
@@ -189,40 +262,40 @@ msgstr "annuler"
 msgid "Unable to remove user"
 msgstr "Impossible de retirer l'utilisateur"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Groupes"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
-msgstr "Groupe Admin"
+msgstr "Admin Groupe"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "ajouter un groupe"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Un nom d'utilisateur valide doit être saisi"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Erreur lors de la création de l'utilisateur"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Un mot de passe valide doit être saisi"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Français"
 
@@ -246,18 +319,42 @@ msgstr "Erreurs et erreurs fatales"
 msgid "Fatal issues only"
 msgstr "Erreurs fatales uniquement"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Aucun"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Connexion"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "En clair"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "Gestionnaire du réseau NT"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Avertissement de sécurité"
 
-#: templates/admin.php:25
+#: 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 "Vous accédez à %s via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS à la place."
 
-#: templates/admin.php:39
+#: 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 "
@@ -266,68 +363,68 @@ msgid ""
 "root."
 msgstr "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Avertissement, problème de configuration"
 
-#: templates/admin.php:53
+#: 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 "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Veuillez consulter à nouveau les <a href=\"%s\">guides d'installation</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' manquant"
 
-#: templates/admin.php:68
+#: 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 "Le module PHP 'fileinfo' est manquant. Il est vivement recommandé de l'activer afin d'obtenir de meilleurs résultats pour la détection des types de fichiers."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Votre version de PHP est trop ancienne"
 
-#: templates/admin.php:82
+#: 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 "Votre version de PHP est trop ancienne. Nous vous recommandons fortement de migrer vers une version 5.3.8 ou plus récente encore, car les versions antérieures sont réputées problématiques. Il est possible que cette installation ne fonctionne pas correctement."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Localisation non fonctionnelle"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Cela signifie qu'il pourrait y avoir des problèmes avec certains caractères dans les noms de fichier."
 
-#: templates/admin.php:106
+#: 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 "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "La connexion internet ne fonctionne pas"
 
-#: templates/admin.php:121
+#: 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 "
@@ -336,118 +433,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par mails ne seront pas fonctionnels également. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Exécute une tâche à chaque chargement de page"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Utilise le service cron du système pour appeler le fichier cron.php toutes les 15 minutes."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Partage"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activer l'API de partage"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Autoriser les applications à utiliser l'API de partage"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Autoriser les liens"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Autoriser les utilisateurs à partager des éléments publiquement à l'aide de liens"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Autoriser les téléversements publics"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permet d'autoriser les autres utilisateurs à téléverser dans le dossier partagé public de l'utilisateur"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Autoriser le repartage"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Autoriser les utilisateurs à partager des éléments qui ont été partagés avec eux"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Autoriser les utilisateurs à partager avec tout le monde"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Autoriser les utilisateurs à partager avec des utilisateurs de leur groupe uniquement"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Autoriser les notifications par couriel"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Autoriser l'utilisateur à envoyer une notification par couriel concernant les fichiers partagés"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sécurité"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forcer HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forcer les clients à se connecter à %s via une connexion chiffrée."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Serveur mail"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Ceci est utilisé pour l'envoi des notifications."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Adresse source"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Authentification requise"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Adresse du serveur"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Informations d'identification"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "Nom d'utilisateur SMTP"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "Mot de passe SMTP"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Paramètres de test d'e-mail"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Envoyer un e-mail"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Niveau de log"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Moins"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -457,30 +614,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Ajoutez votre application"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Plus d'applications…"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Sélectionner une Application"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Documentation :"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Voir la page des applications à l'url apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Voir le site web de l'application"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Documentation utilisateur"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentation administrateur"
@@ -514,7 +675,7 @@ msgstr "Revoir le premier lancement de l'installeur"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -526,151 +687,149 @@ msgstr "Votre mot de passe a été changé"
 msgid "Unable to change your password"
 msgstr "Impossible de changer votre mot de passe"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Changer de mot de passe"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Nom complet"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Adresse mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Votre adresse e-mail"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Photo de profil"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Télécharger nouveau"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Sélectionner un nouveau depuis les documents"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Supprimer l'image"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr "Soit png ou jpg. idéalement carée mais vous pourrez la recadrer ."
+msgstr "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Votre avatar est fourni par votre compte original."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Abandonner"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Annuler"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Choisir en temps que photo de profil "
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Langue"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Aidez à traduire"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Chiffrement"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Mot de passe de connexion"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Déchiffrer tous les fichiers"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr "Nom de la connexion"
+msgstr "Nom d'utilisateur"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Créer"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Récupération du mot de passe administrateur"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
-msgstr "Support de stockage par défaut"
+msgstr "Espace de stockage par défaut"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Veuillez entrer le quota de stockage (ex. \"512 MB\" ou \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Illimité"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Autre"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nom d'utilisateur"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
-msgstr "Support de stockage"
+msgstr "Espace de stockage"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "Modifier le nom complet"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "Changer le mot de passe"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Défaut"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 9a26a1a2d9..09a7f945ab 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Christophe Lherieau <skimpax@gmail.com>, 2013
+# Christophe Lherieau <skimpax@gmail.com>, 2013-2014
 # etiess <etiess@gmail.com>, 2013
 # plachance <patlachance@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,43 +89,43 @@ msgstr "Succès"
 msgid "Error"
 msgstr "Erreur"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Configuration OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Configuration incorrecte"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Configuration incomplète"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Sélectionnez les groupes"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Sélectionner les classes d'objet"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Sélectionner les attributs"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Test de connexion réussi"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Test de connexion échoué"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Confirmer la suppression"
 
@@ -143,11 +143,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s utilisateur trouvé"
 msgstr[1] "%s utilisateurs trouvés"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Hôte invalide"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Impossible de trouver la fonction souhaitée"
 
@@ -165,8 +165,8 @@ msgstr "Aide"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Limiter l'accès à %s aux groupes respectant ce critère :"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Les groupes respectant ces critères sont disponibles dans %s :"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -201,8 +201,8 @@ msgid "groups found"
 msgstr "groupes trouvés"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Quel attribut doit être utilisé comme nom de login:"
+msgid "Users login with this attribute:"
+msgstr "Utilisateurs se connectant avec cet attribut :"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -269,8 +269,8 @@ msgstr "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Limiter l'accès à %s aux utilisateurs respectant ce critère :"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Limiter l'accès à %s aux utilisateurs respectant ces critères :"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -412,41 +412,51 @@ msgstr "Recherche des attributs du groupe"
 msgid "Group-Member association"
 msgstr "Association groupe-membre"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Groupes imbriqués"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Si activé, les groupes contenant d'autres groupes sont supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs)."
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Attributs spéciaux"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Champ du quota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Quota par défaut"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Champ Email"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Convention de nommage du répertoire utilisateur"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laisser vide "
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Nom d'utilisateur interne"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -462,15 +472,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Nom d'utilisateur interne:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Surcharger la détection d'UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -481,19 +491,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Attribut UUID pour les utilisateurs :"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Attribut UUID pour les groupes :"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Association Nom d'utilisateur-Utilisateur LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -507,10 +517,10 @@ msgid ""
 "experimental stage."
 msgstr "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Supprimer l'association utilisateur interne-utilisateur LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Supprimer l'association nom de groupe-groupe LDAP"
diff --git a/l10n/fr_CA/core.po b/l10n/fr_CA/core.po
index 559ab10642..a2dc9cb668 100644
--- a/l10n/fr_CA/core.po
+++ b/l10n/fr_CA/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/fr_CA/files.po b/l10n/fr_CA/files.po
index 945c90682d..37eb098e71 100644
--- a/l10n/fr_CA/files.po
+++ b/l10n/fr_CA/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/fr_CA/files_encryption.po b/l10n/fr_CA/files_encryption.po
index cbf1900218..f709719466 100644
--- a/l10n/fr_CA/files_encryption.po
+++ b/l10n/fr_CA/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/fr_CA/files_external.po b/l10n/fr_CA/files_external.po
index 373a3e669a..adbbd6c0af 100644
--- a/l10n/fr_CA/files_external.po
+++ b/l10n/fr_CA/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-26 21:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:466
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:470
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:473
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/fr_CA/files_sharing.po b/l10n/fr_CA/files_sharing.po
index dfe5c2c332..4aea61c17c 100644
--- a/l10n/fr_CA/files_sharing.po
+++ b/l10n/fr_CA/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-26 21:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/fr_CA/files_trashbin.po b/l10n/fr_CA/files_trashbin.po
index a526cc8e7e..79e8ab337e 100644
--- a/l10n/fr_CA/files_trashbin.po
+++ b/l10n/fr_CA/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-26 21:30+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,16 +22,20 @@ msgstr ""
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:123 js/trash.js:176
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
@@ -55,6 +59,6 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/fr_CA/lib.po b/l10n/fr_CA/lib.po
index 37d8be2602..5ecda61550 100644
--- a/l10n/fr_CA/lib.po
+++ b/l10n/fr_CA/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/fr_CA/settings.po b/l10n/fr_CA/settings.po
index 0653592a54..845f2fc237 100644
--- a/l10n/fr_CA/settings.po
+++ b/l10n/fr_CA/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/fr_CA/user_ldap.po b/l10n/fr_CA/user_ldap.po
index 89e3883b60..e513ed6934 100644
--- a/l10n/fr_CA/user_ldap.po
+++ b/l10n/fr_CA/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 760ba73cc7..7839bd4996 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-23 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 10:00+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +19,11 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s compartiu «%s» con vostede"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "A data de caducidade está no pasado."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Non é posíbel enviar correo aos usuarios seguintes: %s"
@@ -40,19 +40,6 @@ msgstr "Modo de mantemento desactivado"
 msgid "Updated database"
 msgstr "Base de datos actualizada"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Actualizando o ficheiro da caché, isto pode levar bastante tempo..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Ficheiro da caché actualizado"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% feito ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Non forneceu ningunha imaxe ou ficheiro"
@@ -73,135 +60,139 @@ msgstr "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo"
 msgid "No crop data provided"
 msgstr "Non indicou como recortar"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "domingo"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "luns"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "martes"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "mércores"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "xoves"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "venres"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "sábado"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "xaneiro"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "febreiro"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "marzo"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "maio"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "xuño"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "xullo"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "setembro"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "outubro"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "novembro"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "decembro"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Axustes"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Gardando..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "hai %n minuto"
 msgstr[1] "hai %n minutos"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "hai %n hora"
 msgstr[1] "hai %n horas"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "hai %n día"
 msgstr[1] "hai %n días"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "último mes"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "hai %n mes"
 msgstr[1] "hai %n meses"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -269,6 +260,26 @@ msgstr "({count} seleccionados)"
 msgid "Error loading file exists template"
 msgstr "Produciuse un erro ao cargar o modelo de ficheiro existente"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Contrasinal moi feble"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Contrasinal feble"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Contrasinal non moi aló"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Bo contrasinal"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Contrasinal forte"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Compartir"
@@ -277,12 +288,12 @@ msgstr "Compartir"
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Produciuse un erro ao compartir"
 
@@ -294,123 +305,123 @@ msgstr "Produciuse un erro ao deixar de compartir"
 msgid "Error while changing permissions"
 msgstr "Produciuse un erro ao cambiar os permisos"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido con vostede e co grupo {group} por {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vostede por {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Compartir cun usuario ou grupo ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Ligazón para compartir"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Protexido con contrasinais"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Contrasinal"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Permitir o envío público"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Enviar ligazón por correo"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Definir a data de caducidade"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Data de caducidade"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Compartir por correo:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Non se atopou xente"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Non se permite volver a compartir"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "notificar por correo"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protexido con contrasinal"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Produciuse un erro ao retirar a data de caducidade"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Produciuse un erro ao definir a data de caducidade"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Correo enviado"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Aviso"
 
@@ -457,11 +468,17 @@ msgstr "A actualización non foi satisfactoria, informe deste problema á  <a hr
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "Restabelecer o contrasinal %s"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Produciuse un problema ao mesmo tempo que enviaba o correo, póñase en contacto co administrador."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Usa a seguinte ligazón para restabelecer o contrasinal: {link}"
@@ -481,8 +498,8 @@ msgstr "Non foi posíbel facer a petición!<br>Asegúrese de que o seu enderezo
 msgid "You will receive a link to reset your password via Email."
 msgstr "Recibirá unha ligazón por correo para restabelecer o contrasinal"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nome de usuario"
 
@@ -518,6 +535,18 @@ msgstr "Novo contrasinal"
 msgid "Reset password"
 msgstr "Restabelecer o contrasinal"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Persoal"
@@ -526,7 +555,7 @@ msgstr "Persoal"
 msgid "Users"
 msgstr "Usuarios"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplicativos"
 
@@ -636,49 +665,47 @@ msgstr "Para obter información sobre como como configurar axeitadamente o seu s
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear unha <strong>contra de administrador</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avanzado"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Almacenamento e base de datos"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Cartafol de datos"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configurar a base de datos"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "vai ser utilizado"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuario da base de datos"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Contrasinal da base de datos"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nome da base de datos"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Táboa de espazos da base de datos"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Servidor da base de datos"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Rematar a configuración"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Rematado ..."
 
@@ -694,7 +721,7 @@ msgstr "Este aplicativo require que o JavaScript estea activado para unha operat
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está dispoñíbel. Obteña máis información sobre como actualizar."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Desconectar"
 
@@ -720,28 +747,28 @@ msgstr "A autenticación fracasou do lado do servidor!"
 msgid "Please contact your administrator."
 msgstr "Contacte co administrador."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Perdeu o contrasinal?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Conectar"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Accesos alternativos"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Ola,<br><br>Só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Ola,<br><br>só facerlle saber que %s compartiu <strong>%s</strong> con vostede.<br><a href=\"%s\">Véxao!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 00a61f78a7..5d5e1a7178 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,283 +19,290 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Non foi posíbel mover %s; Xa existe un ficheiro con ese nome."
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Non foi posíbel mover %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "O nome de ficheiro non pode estar baleiro"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "O nome do ficheiro non pode conter «/». Escolla outro nome."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "«%s» é un nome incorrecto de ficheiro."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*»."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "O cartafol de destino foi movido ou eliminado."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Xa existe o nome %s no cartafol %s. Escolla outro nome."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Esta orixe non é correcta"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "O servidor non ten permisos para abrir os enderezos URL, comprobe a configuración do servidor"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Produciuse un erro ao descargar %s en %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Produciuse un erro ao crear o ficheiro"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "O nome de cartafol non pode estar baleiro."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "O nome do cartafol non pode conter «/». Escolla outro nome."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Produciuse un erro ao crear o cartafol"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Non é posíbel configurar o directorio de envíos."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Marca incorrecta"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Non se enviou ningún ficheiro. Produciuse un erro descoñecido."
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Non houbo erros, o ficheiro enviouse correctamente"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "O ficheiro enviado excede a directiva indicada por upload_max_filesize de php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O ficheiro enviado excede da directiva MAX_FILE_SIZE especificada no formulario HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro so foi parcialmente enviado"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Non se enviou ningún ficheiro"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Falta o cartafol temporal"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Produciuse un erro ao escribir no disco"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Non hai espazo de almacenamento abondo"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "O envío fracasou. Non foi posíbel obter información do ficheiro."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "O envío fracasou. Non foi posíbel atopar o ficheiro enviado"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "O envío fracasou. Non foi posíbel obter información do ficheiro."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "O directorio é incorrecto."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "O espazo dispoñíbel é insuficiente"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "O tamaño total do ficheiro {size1} excede do límite de envío {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Envío cancelado."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Non foi posíbel obter o resultado do servidor."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "O URL non pode quedar en branco."
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "«Shared» dentro do cartafol persoal é un nome reservado"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "Xa existe un {new_name}"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Non foi posíbel crear o ficheiro"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Non foi posíbel crear o cartafol"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Produciuse un erro ao obter o URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Eliminar permanentemente"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Non foi posíbel renomear o ficheiro"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituír {new_name} por {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Produciuse un erro ao eliminar o ficheiro."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartafol"
 msgstr[1] "%n cartafoles"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n ficheiro"
 msgstr[1] "%n ficheiros"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} e {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Cargando %n ficheiro"
 msgstr[1] "Cargando %n ficheiros"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "«.» é un nome de ficheiro incorrecto"
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "«{name}» é un nome incorrecto de ficheiro."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*»."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "O aplicativo de cifrado está activado, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "A chave privada para o aplicativo de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Está a prepararse a súa descarga. Isto pode levar bastante tempo se os ficheiros son grandes."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Produciuse un erro ao mover o ficheiro"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
@@ -302,12 +310,12 @@ msgstr "Modificado"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nome de cartafol non válido. O uso de «Shared» está reservado."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s non pode cambiar de nome"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Enviar"
 
@@ -343,72 +351,68 @@ msgstr "Tamaño máximo de descarga para os ficheiros ZIP"
 msgid "Save"
 msgstr "Gardar"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Ficheiro novo de texto"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Novo cartafol"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Cartafol"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Desde a ligazón"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar o envío"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Non ten permisos para enviar ou crear ficheiros aquí."
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí non hai nada. Envíe algo."
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Envío demasiado grande"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiros que tenta enviar exceden do tamaño máximo permitido neste servidor"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarde."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Análise actual"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Anovando a caché do sistema de ficheiros..."
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index 32805bfde6..13db5afaa5 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -5,13 +5,13 @@
 # Translators:
 # mbouzada <mbouzada@gmail.com>, 2013
 # mbouzada <mbouzada@gmail.com>, 2013
-# mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-12-01 11:50+0000\n"
+"POT-Creation-Date: 2014-03-15 02:13-0400\n"
+"PO-Revision-Date: 2014-03-14 08:50+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -83,18 +83,18 @@ msgid ""
 "administrator"
 msgstr "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou póñase en contacto co administrador"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Non se cumpren os requisitos."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivado o aplicativo de cifrado."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Os seguintes usuarios non teñen configuración para o cifrado:"
 
@@ -102,9 +102,9 @@ msgstr "Os seguintes usuarios non teñen configuración para o cifrado:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Comezou o cifrado inicial... Isto pode levar bastante tempo. Agarde."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Gardando..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "O cifrado inicial está en execución... Tenteo máis tarde."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index 1c5aff7b46..6d0edfcf68 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mbouzada <mbouzada@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-15 02:13-0400\n"
+"PO-Revision-Date: 2014-03-14 09:10+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +18,44 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Concedeuse acceso"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Produciuse un erro ao configurar o almacenamento en Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Permitir o acceso"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Forneza unha chave correcta e segreda do Dropbox."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Gardado"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Aviso:</b> «smbclient» non está instalado. Non é posibel a montaxe de comparticións CIFS/SMB. Consulte co administrador do sistema para instalalo."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Aviso:</b> A compatibilidade de FTP en PHP non está activada ou instalada. Non é posibel a montaxe de comparticións FTP. Consulte co administrador do sistema para instalalo."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +107,22 @@ msgid "Users"
 msgstr "Usuarios"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Activar o almacenamento externo do usuario"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Permitir aos usuarios montar os seus propios almacenamentos externos"
+msgid "Allow users to mount the following external storage"
+msgstr "Permitirlle aos usuarios montar o seguinte almacenamento externo"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Certificados SSL root"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importar o certificado root"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 1058585dc1..6fb6533da1 100644
--- a/l10n/gl/files_sharing.po
+++ b/l10n/gl/files_sharing.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
+"POT-Creation-Date: 2014-03-15 02:13-0400\n"
+"PO-Revision-Date: 2014-03-14 08:50+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +19,10 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Compartido por {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Esta compartición está protexida con contrasinal"
@@ -54,32 +59,16 @@ msgstr "foi desactivada a compartición"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s compartiu o cartafol %s con vostede"
+msgid "shared by %s"
+msgstr "compartido por %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s compartiu o ficheiro %s con vostede"
+msgid "Download %s"
+msgstr "Descargar %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Descargar"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Enviar"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Cancelar o envío"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Sen vista previa dispoñíbel para"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Ligazón directa"
diff --git a/l10n/gl/files_trashbin.po b/l10n/gl/files_trashbin.po
index eea63f9317..50c9cbfb67 100644
--- a/l10n/gl/files_trashbin.po
+++ b/l10n/gl/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Non foi posíbel eliminar %s permanente"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Non foi posíbel restaurar %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Ficheiros eliminados"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Erro"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "restaurado"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Aquí non hai nada. O cesto do lixo está baleiro!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nome"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Restablecer"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Eliminado"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Ficheiros eliminados"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index daba9df132..d923ae3966 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-15 02:13-0400\n"
+"PO-Revision-Date: 2014-03-14 09:20+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +19,38 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Non é posíbel instalar o aplicativo «%s» por non seren compatíbel  con esta versión do ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Non se especificou o nome do aplicativo"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Axuda"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Persoal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Axustes"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Usuarios"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administración"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Non foi posíbel anovar «%s»."
@@ -62,15 +63,10 @@ msgstr "Tipo de ficheiro descoñecido"
 msgid "Invalid image"
 msgstr "Imaxe incorrecta"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "non foi posíbel abrir «%s»"
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "As descargas ZIP están desactivadas."
@@ -93,74 +89,78 @@ msgid ""
 "administrator."
 msgstr "Descargue os ficheiros en fragmentos máis pequenos e por separado, ou pídallos amabelmente ao seu administrador."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Non foi especificada ningunha orixe ao instalar aplicativos"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Non foi especificada ningunha href ao instalar aplicativos"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Non foi especificada ningunha ruta ao instalar aplicativos desde un ficheiro local"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Os arquivos do tipo %s non están admitidos"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Non foi posíbel abrir o arquivo ao instalar aplicativos"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "O aplicativo non fornece un ficheiro info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Non é posíbel instalar o aplicativo por mor de conter código non permitido"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Non é posíbel instalar o aplicativo por non seren compatíbel  con esta versión do ownCloud."
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Non é posíbel instalar o aplicativo por conter a etiqueta\n<shipped>\n\ntrue\n</shipped>\nque non está permitida para os aplicativos non enviados"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Non é posíbel instalar o aplicativo xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Xa existe o directorio do aplicativo"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Non é posíbel crear o cartafol de aplicativos. Corrixa os permisos. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "O aplicativo non está activado"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Produciuse un erro de autenticación"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Testemuña caducada. Recargue a páxina."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Usuario descoñecido"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Ficheiros"
@@ -194,23 +194,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %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 "Deberá introducir unha conta existente ou o administrador."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Nome de usuario e/ou contrasinal de MySQL incorrecto"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "O nome e/ou o contrasinal do usuario de MySQL/MariaDB non é correcto"
 
 #: 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 "Produciuse un erro na base de datos: «%s»"
@@ -219,30 +219,30 @@ msgstr "Produciuse un erro na base de datos: «%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 "A orde ofensiva foi: «%s»"
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "O usuario MySQL  '%s'@'localhost' xa existe."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "Xa existe o usuario «%s»@«localhost» no MySQL/MariaDB."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Omitir este usuario de MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Eliminar este usuario do MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "O usuario MySQL «%s»@«%%» xa existe."
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "Xa existe o usuario «%s»@«%%» no MySQL/MariaDB"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Omitir este usuario de MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Eliminar este usuario do MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -257,7 +257,7 @@ msgstr "Nome de usuario e/ou contrasinal de Oracle incorrecto"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "A orde ofensiva foi: «%s», nome: %s, contrasinal: %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 "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto"
 
@@ -269,66 +269,72 @@ msgstr "Estabeleza un nome de usuario administrador"
 msgid "Set an admin password."
 msgstr "Estabeleza un contrasinal de administrador"
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Volva comprobar as <a href='%s'>guías de instalación</a>"
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s compartiu «%s» con vostede"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Non foi posíbel atopar a categoría «%s»"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "hai %n minuto"
 msgstr[1] "hai %n minutos"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "hai %n hora"
 msgstr[1] "hai %n horas"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "hoxe"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "onte"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "hai %n día"
 msgstr[1] "hai %n días"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "último mes"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "hai %n mes"
 msgstr[1] "hai %n meses"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "último ano"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "anos atrás"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index c52ea62a0a..2403bc7cc3 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-05 22:23-0500\n"
-"PO-Revision-Date: 2013-12-05 08:40+0000\n"
+"POT-Creation-Date: 2014-03-29 01:55-0400\n"
+"PO-Revision-Date: 2014-03-28 19:40+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,12 +19,54 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Forneceu un valor incorrecto para %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Gardado"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "correo de proba dos axustes"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Se recibiu este correo, semella que a configuración é correcta."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Produciuse un problema ao enviar o correo. Revise os seus axustes."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Correo enviado"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Modo de envío"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Cifrado"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Método de autenticación"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Non foi posíbel cargar a lista desde a App Store"
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20 changepassword/controller.php:55
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
 msgid "Authentication error"
 msgstr "Produciuse un erro de autenticación"
 
@@ -85,91 +128,119 @@ msgstr "Non é posíbel eliminar o usuario do grupo %s"
 msgid "Couldn't update app."
 msgstr "Non foi posíbel actualizar o aplicativo."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Contrasinal incorrecto"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Non subministrado polo usuario"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario"
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo."
 
-#: changepassword/controller.php:87
+#: changepassword/controller.php:81
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
 msgstr "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Non é posíbel cambiar o contrasinal"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Enviando..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Documentación do usuario"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Documentación do administrador"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Actualizar á {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Activar"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Agarde..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Produciuse un erro ao desactivar o aplicativo"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Produciuse un erro ao activar o aplicativo"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Actualizando..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Produciuse un erro mentres actualizaba o aplicativo"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Erro"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Actualizar"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Seleccione unha imaxe para o perfil"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Contrasinal moi feble"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Contrasinal feble"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Contrasinal non moi aló"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Bo contrasinal"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Contrasinal forte"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Descifrando ficheiros... isto pode levar un anaco."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Gardando..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "eliminado"
@@ -182,40 +253,40 @@ msgstr "desfacer"
 msgid "Unable to remove user"
 msgstr "Non é posíbel retirar o usuario"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupo Admin"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "engadir un grupo"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Debe fornecer un nome de usuario"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Produciuse un erro ao crear o usuario"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Debe fornecer un contrasinal"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Aviso: O directorio persoal para o usuario «{user}» xa existe"
 
-#: personal.php:45 personal.php:46
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Galego"
 
@@ -239,18 +310,42 @@ msgstr "Erros e problemas críticos"
 msgid "Fatal issues only"
 msgstr "Só problemas críticos"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ningún"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Acceso"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Simple"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "Xestor NT LAN"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Aviso de seguranza"
 
-#: templates/admin.php:25
+#: 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 "Está accedendo a %s a través de HTTP. Suxerímoslle que configure o seu servidor para requirir, no seu canto, o uso de HTTPS."
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +354,68 @@ msgid ""
 "root."
 msgstr "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través de internet. O ficheiro .htaccess non está a traballar. Suxerímoslle que configure o seu servidor web de tal maneira que o cartafol de datos non estea accesíbel ou que mova o o directorio de datos fóra da raíz de documentos do servidor web."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Configurar os avisos"
 
-#: templates/admin.php:53
+#: 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 "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Volva comprobar as <a href=\"%s\">guías de instalación</a>"
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Non se atopou o módulo «fileinfo»"
 
-#: templates/admin.php:68
+#: 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 "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "A versión de PHP está desactualizada"
 
-#: templates/admin.php:82
+#: 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 "A versión de PHP está desactualizada. Recomendámoslle que a actualice á versión 5.3.8 ou posterior xa que as versións anteriores son coñecidas por estragarse. É probábel que esta instalación no estea a funcionar correctamente."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "A configuración rexional non funciona"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro."
 
-#: templates/admin.php:106
+#: 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 "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "A conexión á Internet non funciona"
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +424,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "O último «cron» executouse ás %s."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "«Cron» aínda non foi executado!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Executar unha tarefa con cada páxina cargada"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Use o servizo de sistema cron para chamar ao ficheiro cron.php cada 15 minutos."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartindo"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activar o API para compartir"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que os aplicativos empreguen o API para compartir"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir ligazóns"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os usuarios compartan elementos ao público con ligazóns"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir os envíos públicos"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir que os usuarios lle permitan a outros enviar aos seus cartafoles compartidos publicamente"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir compartir"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os usuarios compartan de novo os elementos compartidos con eles"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os usuarios compartan con calquera"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os usuarios compartan só cos usuarios dos seus grupos"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir o envío de notificacións por correo"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Permitir que os usuarios envíen notificacións por correo dos ficheiros compartidos"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Seguranza"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forzar HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forzar que os clientes se conecten a %s empregando unha conexión cifrada."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Servidor de correo"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Isto utilizase para o envío de notificacións."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Desde o enderezo"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Requírese autenticación"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Enderezo do servidor"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Porto"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Credenciais"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "Nome de usuario SMTP"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "Contrasinal SMTP"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Correo de proba dos axustes"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Enviar o correo"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Rexistro"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivel de rexistro"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Máis"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versión"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +605,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Engada o seu aplicativo"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Máis aplicativos"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Escolla un aplicativo"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Documentación:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Consulte a páxina do aplicativo en apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Vexa o sitio web do aplicativo"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Documentación do usuario"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentación do administrador"
@@ -507,7 +666,7 @@ msgstr "Amosar o axudante da primeira execución outra vez"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -519,151 +678,149 @@ msgstr "O seu contrasinal foi cambiado"
 msgid "Unable to change your password"
 msgstr "Non é posíbel cambiar o seu contrasinal"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Cambiar o contrasinal"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Correo"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "O seu enderezo de correo"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Escriba un enderezo de correo para activar o contrasinal de recuperación"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Escriba un enderezo de correo para permitir a recuperación de contrasinais e recibir notificacións"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Imaxe do perfil"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Novo envío"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Seleccione unha nova de ficheiros"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Retirar a imaxe"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Calquera png ou jpg. É preferíbel que sexa cadrada, mais poderá recortala."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "O seu avatar é fornecido pola súa conta orixinal."
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Cancelar"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Escolla unha imaxe para o perfil"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Axude na tradución"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Empregue esta ligazón  <a href=\"%s\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Cifrado"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "O aplicativo de cifrado non está activado, descifre todos os ficheiros"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Contrasinal de acceso"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Descifrar todos os ficheiros"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Nome de acceso"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Contrasinal de recuperación do administrador"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Almacenamento predeterminado"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Sen límites"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Almacenamento"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "Cambiar o nome completo"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "estabelecer un novo contrasinal"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Predeterminado"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index f2492dc699..2070e8c715 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +88,43 @@ msgstr "Correcto"
 msgid "Error"
 msgstr "Erro"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Configuración correcta"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Configuración incorrecta"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Configuración incompleta"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Seleccionar grupos"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Seleccione as clases de obxectos"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Seleccione os atributos"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "A proba de conexión foi satisfactoria"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "A proba de conexión fracasou"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Confirma que quere eliminar a configuración actual do servidor?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Confirmar a eliminación"
 
@@ -141,11 +142,11 @@ msgid_plural "%s users found"
 msgstr[0] "Atopouse %s usuario"
 msgstr[1] "Atopáronse %s usuarios"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Máquina incorrecta"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Non foi posíbel atopar a función desexada"
 
@@ -163,8 +164,8 @@ msgstr "Axuda"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Limitar o acceso a %s aos grupos que coincidan con estes criterios:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Os grupos que cumpren estes criterios están dispoñíbeis en %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -199,8 +200,8 @@ msgid "groups found"
 msgstr "atopáronse grupos"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Atributo que utilizar como nome de usuario:"
+msgid "Users login with this attribute:"
+msgstr "Os usuarios inician sesión con este atributo:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -267,8 +268,8 @@ msgstr "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzad
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Limitar o acceso a %s aos usuarios que coincidan con estes criterios:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -410,41 +411,51 @@ msgstr "Atributos de busca do grupo"
 msgid "Group-Member association"
 msgstr "Asociación de grupos e membros"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Grupos aniñados"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Se está activado, admítense grupos que conteñen grupos. (Só funciona se o atributo de membro de grupo conten os DN.)"
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Campo de cota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Cota predeterminada"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Campo do correo"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Regra de nomeado do cartafol do usuario"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Nome de usuario interno"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario. Tamén é parte dun URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atributo do nome de usuario interno:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Ignorar a detección do UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "De xeito predeterminado, o atributo UUID é detectado automaticamente. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Atributo do UUID para usuarios:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Atributo do UUID para grupos:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Asignación do usuario ao «nome de usuario LDAP»"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr "Os nomes de usuario empreganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar a asignación do usuario ao «nome de usuario LDAP»"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Limpar a asignación do grupo ao «nome de grupo LDAP»"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 9489597492..41af2ccd47 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +19,11 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s שיתף/שיתפה איתך את »%s«"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -41,19 +40,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -74,135 +60,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "יום ראשון"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "יום שני"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "יום שלישי"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "יום רביעי"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "יום חמישי"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "יום שישי"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "שבת"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "ינואר"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "פברואר"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "מרץ"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "אפריל"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "מאי"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "יוני"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "יולי"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "אוגוסט"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "ספטמבר"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "אוקטובר"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "נובמבר"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "דצמבר"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "שמירה…"
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "שניות"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "לפני %n דקה"
 msgstr[1] "לפני %n דקות"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "לפני %n שעה"
 msgstr[1] "לפני %n שעות"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "היום"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "אתמול"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "לפני %n יום"
 msgstr[1] "לפני %n ימים"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "לפני %n חודש"
 msgstr[1] "לפני %n חודשים"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "חודשים"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "שנים"
 
@@ -270,6 +260,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "שותף"
@@ -278,12 +288,12 @@ msgstr "שותף"
 msgid "Share"
 msgstr "שתף"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "שגיאה במהלך השיתוף"
 
@@ -295,123 +305,123 @@ msgstr "שגיאה במהלך ביטול השיתוף"
 msgid "Error while changing permissions"
 msgstr "שגיאה במהלך שינוי ההגדרות"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "שותף אתך ועם הקבוצה {group} שבבעלות {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "שותף אתך על ידי {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "הגנה בססמה"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "סיסמא"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "שליחת קישור בדוא״ל למשתמש"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "שליחה"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "הגדרת תאריך תפוגה"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "תאריך התפוגה"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "שיתוף באמצעות דוא״ל:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "לא נמצאו אנשים"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "קבוצה"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "אסור לעשות שיתוף מחדש"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "שותף תחת {item} עם {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "הסר שיתוף"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "ניתן לערוך"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "בקרת גישה"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "יצירה"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "עדכון"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "מחיקה"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "שיתוף"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "מוגן בססמה"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "אירעה שגיאה בביטול תאריך התפוגה"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "מתבצעת שליחה ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "הודעת הדוא״ל נשלחה"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "אזהרה"
 
@@ -458,11 +468,17 @@ msgstr "תהליך העדכון לא הושלם בהצלחה. נא דווח את
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}"
@@ -482,8 +498,8 @@ msgstr "הבקשה נכשלה!<br>האם כתובת הדוא״ל/שם המשתמ
 msgid "You will receive a link to reset your password via Email."
 msgstr "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "שם משתמש"
 
@@ -519,6 +535,18 @@ msgstr "ססמה חדשה"
 msgid "Reset password"
 msgstr "איפוס ססמה"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "אישי"
@@ -527,7 +555,7 @@ msgstr "אישי"
 msgid "Users"
 msgstr "משתמשים"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "יישומים"
 
@@ -637,49 +665,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "יצירת <strong>חשבון מנהל</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "מתקדם"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "תיקיית נתונים"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "הגדרת מסד הנתונים"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "ינוצלו"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "שם משתמש במסד הנתונים"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "ססמת מסד הנתונים"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "שם מסד הנתונים"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "מרחב הכתובות של מסד הנתונים"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "שרת בסיס נתונים"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -695,7 +721,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "התנתקות"
 
@@ -721,27 +747,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "שכחת את ססמתך?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "שמירת הססמה"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "כניסה"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "כניסות אלטרנטיביות"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/he/files.po b/l10n/he/files.po
index d688db7c53..fe83688b06 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,283 +19,290 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "לא ניתן להעביר את %s - קובץ בשם הזה כבר קיים"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "לא ניתן להעביר את %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "שם קובץ אינו יכול להיות ריק"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "לא הועלה קובץ. טעות בלתי מזוהה."
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "לא התרחשה שגיאה, הקובץ הועלה בהצלחה"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "הקובץ הועלה באופן חלקי בלבד"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "שום קובץ לא הועלה"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "תקיה זמנית חסרה"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "הכתיבה לכונן נכשלה"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "אין די שטח פנוי באחסון"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "העלאה נכשלה. לא ניתן להשיג את פרטי הקובץ."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "העלאה נכשלה. לא ניתן להשיג את פרטי הקובץ."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "תיקייה שגויה."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "קבצים"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "לא ניתן לגשת לתוצאות מהשרת."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "מתבצעת כעת העלאת קבצים. עזיבה של העמוד תבטל את ההעלאה."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} כבר קיים"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "שתף"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "מחק לצמיתות"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "שינוי שם"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} הוחלף ב־{old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "ביטול"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "שם"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "זמן שינוי"
 
@@ -303,12 +310,12 @@ msgstr "זמן שינוי"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "העלאה"
 
@@ -344,72 +351,68 @@ msgstr "גודל הקלט המרבי לקובצי ZIP"
 msgid "Save"
 msgstr "שמירה"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "חדש"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "קובץ טקסט"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "תיקייה"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "מקישור"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "קבצים שנמחקו"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ביטול ההעלאה"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "העלאה גדולה מידי"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "הקבצים נסרקים, נא להמתין."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index 1ca4a5dfcb..c401f90b5f 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "שמירה…"
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 91ae5a6c44..913a0768ee 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "הוענקה גישה"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "הענקת גישה"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "נא לספק קוד יישום וסוד תקניים של Dropbox."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "משתמשים"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "הפעלת אחסון חיצוני למשתמשים"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "יאפשר למשתמשים לעגן את האחסון החיצוני שלהם"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "שורש אישורי אבטחת SSL "
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "ייבוא אישור אבטחת שורש"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 0a12ef9671..16b4ac0d82 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 06:20+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "שותף בידי {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s שיתף עמך את התיקייה %s"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s שיתף עמך את הקובץ %s"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "הורדה"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "העלאה"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "ביטול ההעלאה"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "אין תצוגה מקדימה זמינה עבור"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/he/files_trashbin.po b/l10n/he/files_trashbin.po
index b13e9732c8..24c4b7a045 100644
--- a/l10n/he/files_trashbin.po
+++ b/l10n/he/files_trashbin.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# pinzerbib <pinzerbib@gmail.com>, 2014
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +19,48 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "לא ניתן למחוק את %s לצמיתות"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "לא ניתן לשחזר את %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "קבצים שנמחקו"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "שגיאה"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
-msgstr ""
+msgstr "שוחזר"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "אין כאן שום דבר. סל המיחזור שלך ריק!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "שם"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "שחזור"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "נמחק"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "קבצים שנמחקו"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 641d9c7665..c019c598f3 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "עזרה"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "אישי"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "הגדרות"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "משתמשים"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "מנהל"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "שירותי רשת תחת השליטה שלך"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "הורדת ZIP כבויה"
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "יישומים אינם מופעלים"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "שגיאת הזדהות"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "פג תוקף. נא לטעון שוב את הדף."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "קבצים"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s שיתף/שיתפה איתך את »%s«"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "לא ניתן למצוא את הקטגוריה „%s“"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "שניות"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "לפני %n דקות"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "לפני %n שעות"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "היום"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "אתמול"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "לפני %n ימים"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "חודש שעבר"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "לפני %n חודשים"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "שנה שעברה"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "שנים"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index d27b262279..6d958a1421 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "הודעת הדוא״ל נשלחה"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "הצפנה"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "לא ניתן לטעון רשימה מה־App Store"
@@ -114,61 +156,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "תיעוד משתמש"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "עדכון לגרסה {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "בטל"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "הפעלה"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "נא להמתין…"
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "מתבצע עדכון…"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "אירעה שגיאה בעת עדכון היישום"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "עדכון"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "מעודכן"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "שמירה…"
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -182,40 +252,40 @@ msgstr "ביטול"
 msgid "Unable to remove user"
 msgstr "לא ניתן להסיר את המשתמש"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "קבוצות"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "מנהל הקבוצה"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "מחיקה"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "הוספת קבוצה"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "יש לספק שם משתמש תקני"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "יצירת המשתמש נכשלה"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "יש לספק ססמה תקנית"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "עברית"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "כלום"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "התחברות"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "אזהרת אבטחה"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "שגיאת הגדרה"
 
-#: templates/admin.php:53
+#: 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:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "המודול „fileinfo“ חסר"
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "החיבור לאינטרנט אינו פעיל"
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "יש להפעיל משימה אחת עם כל עמוד שנטען"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "שיתוף"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "הפעלת API השיתוף"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "לאפשר ליישום להשתמש ב־API השיתוף"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "לאפשר קישורים"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "לאפשר למשתמשים לשתף פריטים "
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "לאפשר שיתוף מחדש"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "לאפשר למשתמשים לשתף הלאה פריטים ששותפו אתם"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "לאפשר למשתמשים לשתף עם כל אחד"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "אבטחה"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "לאלץ HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "כתובת שרת"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "פורט"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "פרטי גישה"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "רמת הדיווח"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "יותר"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "פחות"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "גרסא"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +604,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "הוספת היישום שלך"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "יישומים נוספים"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "בחירת יישום"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "צפה בעמוד הישום ב apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "תיעוד משתמש"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "תיעוד מנהלים"
@@ -507,7 +665,7 @@ msgstr "הצגת אשף ההפעלה הראשונית שוב"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "סיסמא"
 
@@ -519,151 +677,149 @@ msgstr "הססמה שלך הוחלפה"
 msgid "Unable to change your password"
 msgstr "לא ניתן לשנות את הססמה שלך"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "ססמה נוכחית"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "ססמה חדשה"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "שינוי ססמה"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "דואר אלקטרוני"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "כתובת הדוא״ל שלך"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "תמונת פרופיל"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "ביטול"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "פה"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "עזרה בתרגום"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "הצפנה"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "שם כניסה"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "יצירה"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "ססמת השחזור של המנהל"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "אחסון בררת המחדל"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "ללא הגבלה"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "אחר"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "שם משתמש"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "אחסון"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "הגדרת ססמה חדשה"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "בררת מחדל"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 33d85f4fc8..5a7b24997c 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +87,43 @@ msgstr ""
 msgid "Error"
 msgstr "שגיאה"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "בדיקת החיבור עברה בהצלחה"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "בדיקת החיבור נכשלה"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "האם אכן למחוק את הגדרות השרת הנוכחיות?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "אישור המחיקה"
 
@@ -141,11 +141,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -163,7 +163,7 @@ msgstr "עזרה"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -199,7 +199,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -267,7 +267,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -410,41 +410,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "בבתים"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +470,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +489,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +515,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index c254844765..ed9d8a2cc5 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +19,11 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -41,19 +40,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -74,135 +60,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "रविवार"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "सोमवार"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "मंगलवार"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "बुधवार"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "बृहस्पतिवार"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "शुक्रवार"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "शनिवार"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "जनवरी"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "फरवरी"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "मार्च"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "अप्रैल"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "मई"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "जून"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "जुलाई"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "अगस्त"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "सितम्बर"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "अक्टूबर"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "नवंबर"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "दिसम्बर"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -270,6 +260,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -278,12 +288,12 @@ msgstr ""
 msgid "Share"
 msgstr "साझा करें"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "त्रुटि"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -295,123 +305,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "पासवर्ड"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "भेजें"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "कोई व्यक्ति नहीं मिले "
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "भेजा जा रहा है"
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "ईमेल भेज दिया गया है "
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "चेतावनी "
 
@@ -458,11 +468,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}"
@@ -482,8 +498,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "प्रयोक्ता का नाम"
 
@@ -519,6 +535,18 @@ msgstr "नया पासवर्ड"
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "यक्तिगत"
@@ -527,7 +555,7 @@ msgstr "यक्तिगत"
 msgid "Users"
 msgstr "उपयोगकर्ता"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -637,49 +665,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "व्यवस्थापक खाता बनाएँ"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "उन्नत"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "डाटा फोल्डर"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "डेटाबेस कॉन्फ़िगर करें "
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "उपयोग होगा"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "डेटाबेस उपयोगकर्ता"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "डेटाबेस पासवर्ड"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "डेटाबेस का नाम"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "सेटअप समाप्त करे"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -695,7 +721,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "लोग  आउट"
 
@@ -721,27 +747,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "याद रखें"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 1438dd1547..571ff8efa4 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "साझा करें"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "त्रुटि"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "अपलोड "
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr "सहेजें"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index 7d5c5247a2..104713bda5 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index d437731724..9992c8ee11 100644
--- a/l10n/hi/files_external.po
+++ b/l10n/hi/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "उपयोगकर्ता"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index da1af71a1e..810bbf305c 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "अपलोड "
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/hi/files_trashbin.po b/l10n/hi/files_trashbin.po
index 64da02cb00..759f8e01d2 100644
--- a/l10n/hi/files_trashbin.po
+++ b/l10n/hi/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "त्रुटि"
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 31789dfce8..a0e8492a73 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "सहयोग"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "यक्तिगत"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "सेटिंग्स"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "उपयोगकर्ता"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index a255b6e1db..9b0da8d64a 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "ईमेल भेज दिया गया है "
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "त्रुटि"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "अद्यतन"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "सुरक्षा चेतावनी "
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "पासवर्ड"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "नया पासवर्ड"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "रद्द करना "
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "प्रयोक्ता का नाम"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index f5133c43d7..1c1bdbf62b 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "त्रुटि"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "सहयोग"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 6289c6939a..cc5099c80a 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,139 +58,143 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "nedelja"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "ponedeljak"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "utorak"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "srijeda"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "četvrtak"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "petak"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "subota"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Siječanj"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Veljača"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Ožujak"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Travanj"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Svibanj"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Lipanj"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Srpanj"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Kolovoz"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Rujan"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Listopad"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Studeni"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Prosinac"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Spremanje..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "godina"
 
@@ -273,6 +263,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -281,12 +291,12 @@ msgstr ""
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Greška"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Greška prilikom djeljenja"
 
@@ -298,123 +308,123 @@ msgstr "Greška prilikom isključivanja djeljenja"
 msgid "Error while changing permissions"
 msgstr "Greška prilikom promjena prava"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Zaštiti lozinkom"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Postavi datum isteka"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Dijeli preko email-a:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Osobe nisu pronađene"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Ponovo dijeljenje nije dopušteno"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "može mjenjat"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "kreiraj"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "ažuriraj"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "izbriši"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "djeli"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Greška prilikom brisanja datuma isteka"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Greška prilikom postavljanja datuma isteka"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -461,11 +471,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Koristite ovaj link da biste poništili lozinku: {link}"
@@ -485,8 +501,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Primit ćete link kako biste poništili zaporku putem e-maila."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Korisničko ime"
 
@@ -522,6 +538,18 @@ msgstr "Nova lozinka"
 msgid "Reset password"
 msgstr "Poništavanje lozinke"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Osobno"
@@ -530,7 +558,7 @@ msgstr "Osobno"
 msgid "Users"
 msgstr "Korisnici"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplikacije"
 
@@ -640,49 +668,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Stvori <strong>administratorski račun</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Napredno"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Mapa baze podataka"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Konfiguriraj bazu podataka"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "će se koristiti"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Korisnik baze podataka"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Lozinka baze podataka"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Ime baze podataka"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Poslužitelj baze podataka"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Završi postavljanje"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -698,7 +724,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Odjava"
 
@@ -724,27 +750,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "zapamtiti"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Prijava"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 42ad420919..6670ab986c 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,286 +17,293 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Nema pogreške, datoteka je poslana uspješno."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslana datoteka je parcijalno poslana"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Datoteka nije poslana"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremeni direktorij"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Neuspjelo pisanje na disk"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Učitavanje datoteke. Napuštanjem stranice će prekinuti učitavanje."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Podijeli"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Greška"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja promjena"
 
@@ -304,12 +311,12 @@ msgstr "Zadnja promjena"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Učitaj"
 
@@ -345,72 +352,68 @@ msgstr "Maksimalna veličina za ZIP datoteke"
 msgid "Save"
 msgstr "Snimi"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "novo"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "tekstualna datoteka"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "mapa"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Preuzimanje"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo pričekajte."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index 63899770e5..c74c2e8dff 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Spremanje..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index f33a72e663..b93a5ef818 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Korisnici"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 36eee3f2dd..faa06e0f5e 100644
--- a/l10n/hr/files_sharing.po
+++ b/l10n/hr/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Preuzimanje"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Učitaj"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Prekini upload"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/hr/files_trashbin.po b/l10n/hr/files_trashbin.po
index d2e83f8fae..c4f62d494f 100644
--- a/l10n/hr/files_trashbin.po
+++ b/l10n/hr/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Greška"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Ime"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 3b8b04bcff..e9e53e4718 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Pomoć"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Osobno"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Postavke"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Korisnici"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administrator"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "web usluge pod vašom kontrolom"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Greška kod autorizacije"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Datoteke"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,70 +267,76 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "danas"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "jučer"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "godina"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index f509f28456..c1b59f382c 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Nemogićnost učitavanja liste sa Apps Stora"
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Isključi"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Uključi"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Greška"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Spremanje..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "vrati"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupe"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupa Admin"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Prijava"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "više"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Dodajte vašu aplikaciju"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Odaberite Aplikaciju"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Pogledajte stranicu s aplikacijama na apps.owncloud.com"
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Lozinka"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr "Nemoguće promijeniti lozinku"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Izmjena lozinke"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "e-mail adresa"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Vaša e-mail adresa"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Odustani"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Pomoć prevesti"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "Prijava"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Izradi"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "ostali"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 83f2f5b9f3..0d0c691cf7 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr "Pomoć"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -200,7 +200,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -268,7 +268,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -411,41 +411,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 06314bc8c8..954685a032 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +20,11 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s megosztotta Önnel ezt:  »%s«"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s"
@@ -42,19 +41,6 @@ msgstr "A karbantartási mód kikapcsolva"
 msgid "Updated database"
 msgstr "Frissítet adatbázis"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "A filecache frissítése folyamatban, ez a folyamat hosszabb ideig is eltarthat..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Filecache frissítve"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% kész ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Nincs kép vagy file megadva"
@@ -75,135 +61,139 @@ msgstr "Az átmeneti profil kép nem elérhető, próbáld újra"
 msgid "No crop data provided"
 msgstr "Vágáshoz nincs adat megadva"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "vasárnap"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "hétfő"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "kedd"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "szerda"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "csütörtök"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "péntek"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "szombat"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "január"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "február"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "március"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "április"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "május"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "június"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "július"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "augusztus"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "szeptember"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "október"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "november"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "december"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Mentés..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n perccel ezelőtt"
 msgstr[1] "%n perccel ezelőtt"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n órával ezelőtt"
 msgstr[1] "%n órával ezelőtt"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n nappal ezelőtt"
 msgstr[1] "%n nappal ezelőtt"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n hónappal ezelőtt"
 msgstr[1] "%n hónappal ezelőtt"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "több hónapja"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "több éve"
 
@@ -271,6 +261,26 @@ msgstr "({count} kiválasztva)"
 msgid "Error loading file exists template"
 msgstr "Hiba a létező sablon betöltésekor"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Megosztott"
@@ -279,12 +289,12 @@ msgstr "Megosztott"
 msgid "Share"
 msgstr "Megosztás"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Hiba"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Nem sikerült létrehozni a megosztást"
 
@@ -296,123 +306,123 @@ msgstr "Nem sikerült visszavonni a megosztást"
 msgid "Error while changing permissions"
 msgstr "Nem sikerült módosítani a jogosultságokat"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Megosztotta Önnel és a(z) {group} csoporttal: {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Megosztotta Önnel: {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Megosztani egy felhasználóval vagy csoporttal ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Megosztás hivatkozással"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Jelszóval is védem"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Jelszó"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Feltöltést is engedélyezek"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Email címre küldjük el"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Küldjük el"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Legyen lejárati idő"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "A lejárati idő"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Megosztás emaillel:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Nincs találat"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "csoport"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Ezt az állományt csak a tulajdonosa oszthatja meg másokkal"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Megosztva {item}-ben {user}-rel"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "A megosztás visszavonása"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "email értesítés"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "módosíthat"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "jogosultság"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "létrehoz"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "szerkeszt"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "töröl"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "megoszt"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Jelszóval van védve"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Nem sikerült a lejárati időt törölni"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Nem sikerült a lejárati időt beállítani"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Küldés ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Az emailt elküldtük"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
@@ -459,11 +469,17 @@ msgstr "A frissítés nem sikerült. Kérem értesítse erről a problémáról
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s jelszó visszaállítás"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Használja ezt a linket a jelszó ismételt beállításához: {link}"
@@ -483,8 +499,8 @@ msgstr "A kérést nem sikerült teljesíteni! <br>Biztos, hogy jó emailcímet/
 msgid "You will receive a link to reset your password via Email."
 msgstr "Egy emailben fog értesítést kapni a jelszóbeállítás módjáról."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Felhasználónév"
 
@@ -520,6 +536,18 @@ msgstr "Az új jelszó"
 msgid "Reset password"
 msgstr "Jelszó-visszaállítás"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Személyes"
@@ -528,7 +556,7 @@ msgstr "Személyes"
 msgid "Users"
 msgstr "Felhasználók"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Alkalmazások"
 
@@ -638,49 +666,47 @@ msgstr "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a hre
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Rendszergazdai belépés</strong> létrehozása"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Haladó"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Adatkönyvtár"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Adatbázis konfigurálása"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "adatbázist fogunk használni"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Adatbázis felhasználónév"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Adatbázis jelszó"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Az adatbázis neve"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Az adatbázis táblázattér (tablespace)"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Adatbázis szerver"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "A beállítások befejezése"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Befejezés ..."
 
@@ -696,7 +722,7 @@ msgstr "Az alkalmazás megfelelő működéséhez szükség van JavaScript-re. <
 msgid "%s is available. Get more information on how to update."
 msgstr "%s rendelkezésre áll. További információ a frissítéshez."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Kilépés"
 
@@ -722,28 +748,28 @@ msgstr "A szerveroldali hitelesítés sikertelen!"
 msgid "Please contact your administrator."
 msgstr "Kérjük, lépjen kapcsolatba a rendszergazdával."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Elfelejtette a jelszavát?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "emlékezzen"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Bejelentkezés"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternatív bejelentkezés"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Szia!<br><br>Értesítünk, hogy %s megosztotta veled a következőt: »%s«.<br><a href=\"%s\">Ide kattintva tudod megnézni</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index cec4785ed7..6e63b3157d 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-27 01:55-0500\n"
-"PO-Revision-Date: 2013-12-26 11:10+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,283 +19,290 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Nem sikerült %s áthelyezése"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "A fájlnév nem lehet semmi."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Az állomány neve nem tartalmazhatja a \"/\" karaktert. Kérem válasszon másik nevet!"
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'"
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "A %s név már létezik a %s mappában. Kérem válasszon másik nevet!"
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "A kiinduló állomány érvénytelen"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "A kiszolgálón nincs engedélyezve URL-ek megnyitása, kérem ellenőrizze a beállításokat"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Hiba történt miközben %s-t letöltöttük %s-be"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Hiba történt az állomány létrehozásakor"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "A mappa neve nem maradhat kitöltetlenül"
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "A mappa neve nem tartalmazhatja a \"/\" karaktert. Kérem válasszon másik nevet!"
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Hiba történt a mappa létrehozásakor"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Nem található a mappa, ahova feltölteni szeretne."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Hibás mappacím"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Nem történt feltöltés. Ismeretlen hiba"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "A fájlt sikerült feltölteni"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML  formban került megadásra."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Az eredeti fájlt csak részben sikerült feltölteni."
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Nem töltődött fel állomány"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Hiányzik egy ideiglenes mappa"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Nem sikerült a lemezre történő írás"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Nincs elég szabad hely."
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "A feltöltés nem sikerült. Nem található a feltöltendő állomány."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Érvénytelen mappa."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Fájlok"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll."
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Nincs elég szabad hely"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "A feltöltést megszakítottuk."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "A kiszolgálótól nem kapható meg az eredmény."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "Az URL-cím nem maradhat kitöltetlenül"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "A kiindulási mappában a 'Shared' egy belső használatra fenntartott név"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} már létezik"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Az állomány nem hozható létre"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "A mappa nem hozható létre"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "A megadott URL-ről nem sikerül adatokat kapni"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Megosztás"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Végleges törlés"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Átnevezés"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Az állomány nem nevezhető át"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} fájlt kicseréltük ezzel:  {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "visszavonás"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Hiba a file törlése közben."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappa"
 msgstr[1] "%n mappa"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n állomány"
 msgstr[1] "%n állomány"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} és {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n állomány feltöltése"
 msgstr[1] "%n állomány feltöltése"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' fájlnév érvénytelen."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'"
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben."
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "A tároló majdnem tele van ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Az állományok titkosítása engedélyezve van, de az Ön titkos kulcsai nincsenek beállítva. Ezért kérjük, hogy jelentkezzen ki, és lépjen be újra!"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Az állományok titkosításához használt titkos kulcsa érvénytelen. Kérjük frissítse a titkos kulcs jelszót a személyes beállításokban, hogy ismét hozzáférjen a titkosított állományaihoz!"
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Készül a letöltendő állomány. Ez eltarthat egy ideig, ha nagyok a fájlok."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Az állomány áthelyezése nem sikerült."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Hiba"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Név"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Módosítva"
 
@@ -303,12 +310,12 @@ msgstr "Módosítva"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Érvénytelen mappanév. A 'Shared' a rendszer számára fenntartott elnevezés."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s átnevezése nem sikerült"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Feltöltés"
 
@@ -344,72 +351,68 @@ msgstr "ZIP-fájlok maximális kiindulási mérete"
 msgid "Save"
 msgstr "Mentés"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Új"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Új szöveges file"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Szövegfájl"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Új mappa"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Mappa"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Feltöltés linkről"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Törölt fájlok"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "A feltöltés megszakítása"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Önnek nincs jogosultsága ahhoz, hogy ide állományokat töltsön föl, vagy itt újakat hozzon létre"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Itt nincs semmi. Töltsön fel valamit!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "A feltöltés túl nagy"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A feltöltendő állományok mérete meghaladja a kiszolgálón megengedett maximális méretet."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "A fájllista ellenőrzése zajlik, kis türelmet!"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Ellenőrzés alatt"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "A fájlrendszer gyorsítótárának frissítése zajlik..."
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index ee719e9280..99e10dc725 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-27 01:55-0500\n"
-"PO-Revision-Date: 2013-12-26 13:50+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,18 +83,18 @@ msgid ""
 "administrator"
 msgstr "Ismeretlen hiba. Ellenőrizze a rendszer beállításait vagy forduljon a rendszergazdához!"
 
-#: hooks/hooks.php:62
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Hiányzó követelmények."
 
-#: hooks/hooks.php:63
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Kérem gondoskodjon arról, hogy PHP 5.3.3 vagy annál frissebb legyen telepítve, továbbá az OpenSSL a megfelelő PHP-bővítménnyel együtt rendelkezésre álljon és helyesen legyen konfigurálva! A titkosító modul egyelőre kikapcsolásra került."
 
-#: hooks/hooks.php:281
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "A következő felhasználók nem állították be a titkosítást:"
 
@@ -102,9 +102,9 @@ msgstr "A következő felhasználók nem állították be a titkosítást:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltarthat. Kérem várjon."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Mentés..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 84343fbce5..469445c337 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Érvényes hozzáférés"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "A Dropbox tárolót nem sikerült beállítani"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Megadom a hozzáférést"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Adjon meg egy érvényes Dropbox app key-t és secretet!"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "A Google Drive tárolót nem sikerült beállítani"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Figyelem:</b> az \"smbclient\" nincs telepítve a kiszolgálón. Emiatt nem lehet CIFS/SMB megosztásokat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Figyelem:</b> a PHP FTP támogatása vagy nincs telepítve, vagy nincs engedélyezve a kiszolgálón. Emiatt nem lehetséges FTP-tárolókat fölcsatolni. Kérje meg a rendszergazdát, hogy telepítse a szükséges programot."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Felhasználók"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Külső tárolók engedélyezése a felhasználók részére"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Lehetővé teszi, hogy a felhasználók külső tárolási szolgáltatásokat csatoljanak be a saját területükre"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL tanúsítványok"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "SSL tanúsítványok importálása"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index eb24f8de4b..dd0b394b91 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Megosztotta: {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Ez egy jelszóval védett megosztás"
@@ -54,32 +58,16 @@ msgstr "letiltásra került a megosztás"
 msgid "For more info, please ask the person who sent this link."
 msgstr "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!"
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s megosztotta Önnel ezt a mappát: %s"
+msgid "shared by %s"
+msgstr "Megosztotta: %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s megosztotta Önnel ezt az állományt: %s"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Letöltés"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Feltöltés"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "A feltöltés megszakítása"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Nem áll rendelkezésre előnézet ehhez: "
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Közvetlen link"
diff --git a/l10n/hu_HU/files_trashbin.po b/l10n/hu_HU/files_trashbin.po
index 218eeecb95..06b4c26766 100644
--- a/l10n/hu_HU/files_trashbin.po
+++ b/l10n/hu_HU/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nem sikerült %s végleges törlése"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Nem sikerült %s visszaállítása"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Törölt fájlok"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Hiba"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "visszaállítva"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Itt nincs semmi. Az Ön szemetes mappája üres!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Név"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Visszaállítás"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Törölve"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Törlés"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Törölt fájlok"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 1132f401cb..875d728f20 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,38 +20,38 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "A(z) \"%s\" alkalmazást nem lehet telepíteni, mert nem kompatibilis az ownCloud telepített verziójával."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Nincs az alkalmazás név megadva."
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Súgó"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Személyes"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Beállítások"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Felhasználók"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Adminsztráció"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Sikertelen Frissítés \"%s\"."
@@ -64,15 +64,10 @@ msgstr "Ismeretlen file tipús"
 msgid "Invalid image"
 msgstr "Hibás kép"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "webszolgáltatások saját kézben"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "nem sikerült megnyitni \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "A ZIP-letöltés nincs engedélyezve."
@@ -95,74 +90,78 @@ msgid ""
 "administrator."
 msgstr "A file-t kisebb részekben töltsd le vagy beszélj az adminisztrátorral a megoldás érdekében."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Az alkalmazás telepítéséhez nincs forrás megadva"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Az alkalmazás http-n keresztül történő telepítéséhez nincs href hivetkozás megadva"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Az alkalmazás helyi telepítéséhez nincs útvonal (mappa) megadva"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "A(z) %s típusú tömörített állomány nem támogatott"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Nem sikerült megnyitni a tömörített állományt a telepítés során"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Az alkalmazás nem szolgáltatott info.xml file-t"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Az alalmazás nem telepíthető, mert nem kompatibilis az ownClod ezzel a verziójával."
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Az alkalmazást nem lehet telepíteni, mert az info.xml/version-ben megadott verzió nem egyezik az alkalmazás-áruházban feltüntetett verzióval."
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Az alkalmazás mappája már létezik"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Nem lehetett létrehozni az alkalmzás mappáját. Kérlek ellenőrizd a jogosultásgokat. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Az alkalmazás nincs engedélyezve"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Azonosítási hiba"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "A token lejárt. Frissítse az oldalt."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Fájlok"
@@ -202,8 +201,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia"
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "A MySQL felhasználói név és/vagy jelszó érvénytelen"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -230,21 +229,21 @@ msgstr "A hibát ez a parancs okozta: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "A '%s'@'localhost' MySQL felhasználó már létezik."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Törölje ezt a felhasználót a MySQL-ből"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "A '%s'@'%%' MySQL felhasználó már létezik"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Törölje ezt a felhasználót a MySQL-ből."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -271,66 +270,72 @@ msgstr "Állítson be egy felhasználói nevet az adminisztrációhoz."
 msgid "Set an admin password."
 msgstr "Állítson be egy jelszót az adminisztrációhoz."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s megosztotta Önnel ezt:  »%s«"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Ez a kategória nem található: \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "pár másodperce"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n perccel ezelőtt"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n órával ezelőtt"
 msgstr[1] "%n órával ezelőtt"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "ma"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "tegnap"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n nappal ezelőtt"
 msgstr[1] "%n nappal ezelőtt"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n hónappal ezelőtt"
 msgstr[1] "%n hónappal ezelőtt"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "tavaly"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "több éve"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 39d04cb9e3..ebd9fa5baf 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-15 16:40+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +21,48 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Az emailt elküldtük"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Titkosítás"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Nem tölthető le a lista az App Store-ból"
@@ -117,62 +159,90 @@ msgstr "A back-end nem támogatja a jelszó módosítást, de felhasználó titk
 msgid "Unable to change password"
 msgstr "Nem sikerült megváltoztatni a jelszót"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Felhasználói leírás"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Frissítés erre a verzióra: {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Letiltás"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "engedélyezve"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Kérem várjon..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Hiba az alkalmazás kikapcsolása közben"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Hiba az alalmazás engedélyezése közben"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Frissítés folyamatban..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Hiba történt a programfrissítés közben"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Hiba"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Frissítés"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Frissítve"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Válassz profil képet"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ..."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Mentés..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "törölve"
@@ -185,40 +255,40 @@ msgstr "visszavonás"
 msgid "Unable to remove user"
 msgstr "A felhasználót nem sikerült eltávolítáni"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Csoportok"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Csoportadminisztrátor"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Törlés"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "csoport hozzáadása"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Érvényes felhasználónevet kell megadnia"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "A felhasználó nem hozható létre"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Érvényes jelszót kell megadnia"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára  már létezett"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -242,18 +312,42 @@ msgstr "Hibák és végzetes hibák"
 msgid "Fatal issues only"
 msgstr "Csak a végzetes hibák"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Egyik sem"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Bejelentkezés"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Biztonsági figyelmeztetés"
 
-#: templates/admin.php:25
+#: 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 "Jelenlegi elérése a következőnek '%s' jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálot úgy állitsd be, hogy HTTPS-t tudjál használni."
 
-#: templates/admin.php:39
+#: 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 "
@@ -262,68 +356,68 @@ msgid ""
 "root."
 msgstr "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon erősen ajánlott, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "A beállítással kapcsolatos figyelmeztetés"
 
-#: templates/admin.php:53
+#: 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 "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "A 'fileinfo' modul hiányzik"
 
-#: templates/admin.php:68
+#: 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 "A 'fileinfo' PHP modul hiányzik. Erősen javasolt ennek a modulnak a telepítése a MIME-típusok felismerésének eredményessé tételéhez."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "A PHP verzió túl régi"
 
-#: templates/admin.php:82
+#: 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 "A PHP verzió túl régi. Nagyon ajánlott legalább az 5.3.8-as vagy újabb verzióra frissíteni, mert a régebbi verziónál léteznek ismert hibák. Ezért lehet a telepítésed elkézelhető, hogy nem müködik majd megfelelően."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "A nyelvi lokalizáció nem működik"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "A rendszer lokálok nem lehetett olyat beállítani ami támogatja az UTF-8-at."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Ez arra utal, hogy probléma lehet néhány karakterrel a file neveiben."
 
-#: templates/admin.php:106
+#: 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 "Erősen ajánlott telepíteni a szükséges csomagokat a rendszeredbe amely támogat egyet a következő helyi beállítások közül: %s"
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Az internet kapcsolat nem működik"
 
-#: templates/admin.php:121
+#: 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 "
@@ -332,118 +426,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "A kiszolgálónak nincs müködő internet kapcsolata. Ez azt jelenti, hogy néhány képességét a kiszolgálónak mint például becsatolni egy külső tárolót, értesítések külső gyártók programjának frissítéséről nem fog müködni. A távolról való elérése a fileoknak és email értesítések küldése szintén nem fog müködni. Ha használni szeretnéd mindezeket a képességeit a szervernek, ahoz javasoljuk, hogy engedélyezzed az internet elérését a szervernek."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Ütemezett feladatok"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Használjuk a rendszer cron szolgáltatását, hogy 15 percenként egyszer futtassa le a cron.php-t."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Megosztás"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "A megosztás API-jának engedélyezése"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Lehetővé teszi, hogy a programmodulok is használhassák a megosztást"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Linkek engedélyezése"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Lehetővé teszi, hogy a felhasználók linkek segítségével külsősökkel is megoszthassák az adataikat"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Feltöltést engedélyezése mindenki számára"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Engedélyezni a felhasználóknak, hogy beállíithassák, hogy mások feltölthetnek a nyilvánosan megosztott mappákba."
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "A továbbosztás engedélyezése"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Lehetővé teszi, hogy a felhasználók a velük megosztott állományokat megosszák egy további, harmadik féllel"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "A felhasználók bárkivel megoszthatják állományaikat"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "A felhasználók csak olyanokkal oszthatják meg állományaikat, akikkel közös csoportban vannak"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "E-mail értesítések engedélyezése"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Engedélyezi, hogy a felhasználók e-mail értesítést küldhessenek a megosztott fájlokról."
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Biztonság"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Kötelező HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Kérjük kapcsolodjon a %s rendszerhez HTTPS protokollon keresztül, hogy be vagy ki kapcsoljaa kötelező SSL beállítást."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "A kiszolgáló címe"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Azonosítók"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Naplózás"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Naplózási szint"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Több"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Kevesebb"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Verzió"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -453,30 +607,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Az alkalmazás hozzáadása"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "További alkalmazások"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Válasszon egy alkalmazást"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Lásd apps.owncloud.com, alkalmazások oldal"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Felhasználói leírás"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Üzemeltetői leírás"
@@ -510,7 +668,7 @@ msgstr "Nézzük meg újra az első bejelentkezéskori segítséget!"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Jelszó"
 
@@ -522,151 +680,149 @@ msgstr "A jelszava megváltozott"
 msgid "Unable to change your password"
 msgstr "A jelszó nem változtatható meg"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "A jelenlegi jelszó"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Az új jelszó"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "A jelszó megváltoztatása"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Teljes név"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Az Ön email címe"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilkép"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Új feltöltése"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Új kiválasztása Fileokból"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Kép eltávolítása"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Egyaránt png vagy jpg. Az ideális ha négyzet alaku, de késöbb még átszabható"
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Az avatarod az eredeti fiókod alapján van beállítva."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Megszakítás"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Mégsem"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Válassz profil képet"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Nyelv"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Segítsen a fordításban!"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Ezt a címet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Titkosítás"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "A titkosító alkalmazás továbbiakban nem lesz engedélyezve, szüntesd meg a titkosítását a file-jaidnak."
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Bejelentkezési jelszó"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Kititkosítja az összes file-t"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Bejelentkezési név"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Létrehozás"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "A jelszóvisszaállítás adminisztrációja"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Alapértelmezett tárhely"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Kérjük adja meg a tárolási kvótát (pl.  \"512 MB\" vagy \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Korlátlan"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Más"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Felhasználónév"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Tárhely"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "a teljes név megváltoztatása"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "új jelszó beállítása"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Alapértelmezett"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 5afefda925..37aa013a6f 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: ebela <bela@dandre.hu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,43 +88,43 @@ msgstr "Sikeres végrehajtás"
 msgid "Error"
 msgstr "Hiba"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Konfiguráció OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Konfiguráió hibás"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Konfiguráció nincs befejezve"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Csoportok kiválasztása"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Objektumosztályok kiválasztása"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Attribútumok kiválasztása"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "A kapcsolatellenőrzés eredménye: sikerült"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "A kapcsolatellenőrzés eredménye: nem sikerült"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Tényleg törölni szeretné a kiszolgáló beállításait?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "A törlés megerősítése"
 
@@ -142,11 +142,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s felhasználó van"
 msgstr[1] "%s felhasználó van"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Érvénytelen gépnév"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "A kívánt funkció nem található"
 
@@ -164,8 +164,8 @@ msgstr "Súgó"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Korlátozzuk %s elérését a következő feltételeknek megfelelő csoportokra:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -200,8 +200,8 @@ msgid "groups found"
 msgstr "csoport van"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Melyik attribútumot használjuk login névként:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -268,8 +268,8 @@ msgstr "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasz
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Korlátozzuk %s elérését a következő feltételeknek megfelelő felhasználókra:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -411,41 +411,51 @@ msgstr "A csoportok lekérdezett attribútumai"
 msgid "Group-Member association"
 msgstr "A csoporttagság attribútuma"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Különleges attribútumok"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kvóta mező"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Alapértelmezett kvóta"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "bájtban"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Email mező"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "A home könyvtár elérési útvonala"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!"
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Belső felhasználónév"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Alapértelmezetten a belső felhasználónév az UUID tulajdonságból jön létre. Ez biztosítja a felhasználónév egyediségét és hogy a nem kell konvertálni a karaktereket benne. A belső felhasználónévnél a megkötés az, hogy csak a következő karakterek engdélyezettek benne: [ a-zA-Z0-9_.@- ]. Ezeken a karaktereken kivül minden karakter le lesz cserélve az adott karakter ASCII kódtáblában használható párjára vagy ha ilyen nincs akkor egyszerűen ki lesz hagyva. Ha így mégis ütköznének a nevek akkor hozzá lesz füzve egy folyamatosan növekvő számláló rész. A  belső felhasználónevet lehet használni a felhasználó azonosítására a programon belül. Illetve ez lesz az alapáértelmezett neve a felhasználó kezdő könyvtárának az ownCloud-ban. Illetve..............................."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "A belső felhasználónév attribútuma:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Az UUID-felismerés felülbírálása"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Az UUID attribútum alapértelmezetten felismerésre kerül. Az UUID attribútum segítségével az LDAP felhasználók és csoportok egyértelműen azonosíthatók. A belső felhasználónév is azonos lesz az UUID-vel, ha fentebb nincs másként definiálva. Ezt a beállítást felülbírálhatja és bármely attribútummal helyettesítheti. Ekkor azonban gondoskodnia kell arról, hogy a kiválasztott attribútum minden felhasználó és csoport esetén lekérdezhető és egyedi értékkel bír. Ha a mezőt üresen hagyja, akkor az alapértelmezett attribútum lesz érvényes. Egy esetleges módosítás csak az újonnan hozzárendelt (ill. létrehozott) felhasználókra és csoportokra lesz érvényes."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "A felhasználók UUID attribútuma:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "A csoportok UUID attribútuma:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Felhasználó - LDAP felhasználó hozzárendelés"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr "A felhasználónevek segítségével történik a (meta)adatok tárolása és hozzárendelése. A felhasználók pontos azonosítása céljából minden LDAP felhasználóhoz egy belső felhasználónevet rendelünk. Ezt a felhasználónevet az LDAP felhasználó UUID attribútumához rendeljük hozzá. Ezen túlmenően a DN is tárolásra kerül a gyorsítótárban, hogy csökkentsük az LDAP lekérdezések számát, de a DN-t nem használjuk azonosításra. Ha a DN megváltozik, akkor a rendszer ezt észleli. A belső felhasználóneveket a rendszer igen sok helyen használja, ezért a hozzárendelések törlése sok érvénytelen adatrekordot eredményez az adatbázisban. A hozzárendelések törlése nem függ a konfigurációtól, minden LDAP konfigurációt érint! Ténylegesen működő szolgáltatás esetén sose törölje a hozzárendeléseket, csak tesztelési vagy kísérleti célú szerveren!"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "A felhasználó - LDAP felhasználó hozzárendelés törlése"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "A csoport - LDAP csoport hozzárendelés törlése"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index f4c4980038..eee6695972 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Կիրակի"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Երկուշաբթի"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Երեքշաբթի"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Չորեքշաբթի"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Հինգշաբթի"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Ուրբաթ"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Շաբաթ"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Հունվար"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Փետրվար"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Մարտ"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Ապրիլ"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Մայիս"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Հունիս"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Հուլիս"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Օգոստոս"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Սեպտեմբեր"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Հոկտեմբեր"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Նոյեմբեր"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Դեկտեմբեր"
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 7449a23480..b8176dd374 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr "Պահպանել"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Բեռնել"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Ջնջել"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/hy/files_encryption.po b/l10n/hy/files_encryption.po
index ccf3ebcc24..6379ac121a 100644
--- a/l10n/hy/files_encryption.po
+++ b/l10n/hy/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/hy/files_external.po b/l10n/hy/files_external.po
index 6b9791aa98..10f068d612 100644
--- a/l10n/hy/files_external.po
+++ b/l10n/hy/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-04-26 08:01+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Ջնջել"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 0852fdce9b..3948e67f64 100644
--- a/l10n/hy/files_sharing.po
+++ b/l10n/hy/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr "Բեռնել"
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/hy/files_trashbin.po b/l10n/hy/files_trashbin.po
index 499cc4c2ca..f41cdd7798 100644
--- a/l10n/hy/files_trashbin.po
+++ b/l10n/hy/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Ջնջել"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index a54f97275b..b81e6dd42c 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index d3c43e0c90..5d2492a437 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Ջնջել"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Այլ"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 74da815526..1acfafd169 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 881393b8fc..8f19872d14 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Dominica"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Lunedi"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Mercuridi"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Jovedi"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Venerdi"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sabbato"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "januario"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februario"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Martio"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Junio"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Julio"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Augusto"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Septembre"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Octobre"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr "Compartir"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Contrasigno"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "gruppo"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Leva compartir"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "pote modificar"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nomine de usator"
 
@@ -517,6 +533,18 @@ msgstr "Nove contrasigno"
 msgid "Reset password"
 msgstr "Reinitialisar contrasigno"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -525,7 +553,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usatores"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Applicationes"
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear un <strong>conto de administration</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avantiate"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Dossier de datos"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configurar le base de datos"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "essera usate"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usator de base de datos"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Contrasigno de base de datos"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nomine de base de datos"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Hospite de base de datos"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Clauder le session"
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Tu perdeva le contrasigno?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "memora"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Aperir session"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 6c4344ca4b..5b6b0d6076 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le file incargate solmente esseva incargate partialmente"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate."
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Files"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Compartir"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificate"
 
@@ -301,12 +308,12 @@ msgstr "Modificate"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Incargar"
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr "Salveguardar"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nove"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "File de texto"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index ad8dfdbd93..ef8a1d96f5 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index 9b9f183f6f..2ead0f4a73 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Usatores"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 82ad5f791c..e379fe15ec 100644
--- a/l10n/ia/files_sharing.po
+++ b/l10n/ia/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Discargar"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Incargar"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ia/files_trashbin.po b/l10n/ia/files_trashbin.po
index c373b8961e..6333e27184 100644
--- a/l10n/ia/files_trashbin.po
+++ b/l10n/ia/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Error"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nomine"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Deler"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index f0bcf02cf0..9304e0a841 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Adjuta"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Configurationes"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Usatores"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administration"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Files"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 5c48ba4fac..e3e14d2e0b 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Actualisar"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Gruppos"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Deler"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Interlingua"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Plus"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Adder tu application"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Selectionar un app"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr "Non pote cambiar tu contrasigno"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Contrasigno currente"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nove contrasigno"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Cambiar contrasigno"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Tu adresse de e-posta"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Imagine de profilo"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Cancellar"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Linguage"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Adjuta a traducer"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Crear"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Altere"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nomine de usator"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 617c5c580f..8cf13b0b0d 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "Adjuta"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index b386490605..40cd13bd6d 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-08 01:55-0500\n"
-"PO-Revision-Date: 2014-01-07 07:10+0000\n"
-"Last-Translator: arifpedia <arifpedia@gmail.com>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s membagikan »%s« dengan anda"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Tidak dapat mengirim Email ke pengguna berikut: %s"
@@ -39,19 +38,6 @@ msgstr "Matikan mode perawatan"
 msgid "Updated database"
 msgstr "Basis data terbaru"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Memperbarui filecache, mungkin memerlukan waktu sangat lama..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Filecache terbaru"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% selesai ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Tidak ada gambar atau file yang disediakan"
@@ -72,131 +58,135 @@ msgstr "Tidak ada gambar profil sementara yang tersedia, coba lagi"
 msgid "No crop data provided"
 msgstr "Tidak ada data krop tersedia"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Minggu"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Senin"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Kamis"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Jumat"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Maret"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mei"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Agustus"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: js/js.js:872
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Menyimpan..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:873
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n menit yang lalu"
 
-#: js/js.js:874
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n jam yang lalu"
 
-#: js/js.js:875
+#: js/js.js:998
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:876
+#: js/js.js:999
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:877
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n hari yang lalu"
 
-#: js/js.js:878
+#: js/js.js:1001
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:879
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n bulan yang lalu"
 
-#: js/js.js:880
+#: js/js.js:1003
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:881
+#: js/js.js:1004
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:882
+#: js/js.js:1005
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -263,6 +253,26 @@ msgstr "({count} terpilih)"
 msgid "Error loading file exists template"
 msgstr "Galat memuat templat berkas yang sudah ada"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Dibagikan"
@@ -271,12 +281,12 @@ msgstr "Dibagikan"
 msgid "Share"
 msgstr "Bagikan"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Galat"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Galat ketika membagikan"
 
@@ -288,123 +298,123 @@ msgstr "Galat ketika membatalkan pembagian"
 msgid "Error while changing permissions"
 msgstr "Galat ketika mengubah izin"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Dibagikan dengan anda dan grup {group} oleh {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Dibagikan dengan anda oleh {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Bagikan dengan pengguna atau grup ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Bagikan tautan"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Lindungi dengan sandi"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Sandi"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Izinkan Unggahan Publik"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Emailkan tautan ini ke orang"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Kirim"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Atur tanggal kedaluwarsa"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Tanggal kedaluwarsa"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Bagian lewat email:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Tidak ada orang ditemukan"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Berbagi ulang tidak diizinkan"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Dibagikan dalam {item} dengan {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Batalkan berbagi"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "notifikasi via email"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "dapat sunting"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "kontrol akses"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "buat"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "perbarui"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "hapus"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "bagikan"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Sandi dilindungi"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Galat ketika menghapus tanggal kedaluwarsa"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Galat ketika mengatur tanggal kedaluwarsa"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Mengirim ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email terkirim"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Peringatan"
 
@@ -451,11 +461,17 @@ msgstr "Pembaruan gagal. Silakan laporkan masalah ini ke <a href=\"https://githu
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s sandi diatur ulang"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}"
@@ -475,8 +491,8 @@ msgstr "Permintaan gagal!<br>Apakah anda yakin email/nama pengguna anda benar?"
 msgid "You will receive a link to reset your password via Email."
 msgstr "Anda akan menerima tautan penyetelan ulang sandi lewat Email."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nama pengguna"
 
@@ -512,6 +528,18 @@ msgstr "Sandi baru"
 msgid "Reset password"
 msgstr "Atur ulang sandi"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Pribadi"
@@ -520,7 +548,7 @@ msgstr "Pribadi"
 msgid "Users"
 msgstr "Pengguna"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplikasi"
 
@@ -630,49 +658,47 @@ msgstr "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan l
 msgid "Create an <strong>admin account</strong>"
 msgstr "Buat sebuah <strong>akun admin</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Lanjutan"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Folder data"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Konfigurasikan basis data"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Pengguna basis data"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Sandi basis data"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nama basis data"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tablespace basis data"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Host basis data"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Menyelesaikan ..."
 
@@ -688,7 +714,7 @@ msgstr "Aplikasi ini memerlukan JavaScript yang diaktifkan untuk beroperasi deng
 msgid "%s is available. Get more information on how to update."
 msgstr "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Keluar"
 
@@ -714,28 +740,28 @@ msgstr "Otentikasi dari sisi server gagal!"
 msgid "Please contact your administrator."
 msgstr "Silahkan hubungi administrator anda."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Lupa sandi?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "selalu masuk"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Masuk"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Cara Alternatif untuk Masuk"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hai,<br><br>hanya supaya anda tahu bahwa %s membagikan »%s« dengan anda.<br><a href=\"%s\">Lihat!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/id/files.po b/l10n/id/files.po
index b215125282..1f2f31785c 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-08 01:55-0500\n"
-"PO-Revision-Date: 2014-01-07 08:10+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -18,280 +18,287 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Tidak dapat memindahkan %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Nama berkas tidak boleh kosong."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Nama berkas tidak boleh mengandung \"/\". Silakan pilih nama yang berbeda."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Sumber tidak sah"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Galat saat mengunduh %s ke %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Galat saat membuat berkas"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Nama folder tidak bolh kosong."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Nama folder tidak boleh mengandung \"/\". Silakan pilih nama yang berbeda."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Galat saat membuat folder"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Tidak dapat mengatur folder unggah"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Token tidak sah"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Tidak ada berkas yang diunggah. Galat tidak dikenal."
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Tidak ada galat, berkas sukses diunggah"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Berkas yang diunggah melampaui direktif MAX_FILE_SIZE yang ditentukan dalam formulir HTML."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Berkas hanya diunggah sebagian"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Tidak ada berkas yang diunggah"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Folder sementara tidak ada"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Gagal menulis ke disk"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Ruang penyimpanan tidak mencukupi"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Unggah gagal. Tidak mendapatkan informasi berkas."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Unggah gagal. Tidak menemukan berkas yang akan diunggah"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Unggah gagal. Tidak mendapatkan informasi berkas."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Direktori tidak valid."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Berkas"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Ruang penyimpanan tidak mencukupi"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Tidak mendapatkan hasil dari server."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL tidak boleh kosong"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Pada folder home, 'Shared' adalah nama berkas yang sudah digunakan"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} sudah ada"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Tidak dapat membuat berkas"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Tidak dapat membuat folder"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Bagikan"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Hapus secara permanen"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Ubah nama"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Tidak dapat mengubah nama berkas"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "mengganti {new_name} dengan {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "urungkan"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Galat saat menghapus berkas."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n folder"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n berkas"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} dan {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Mengunggah %n berkas"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' bukan nama berkas yang valid."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Aplikasi Enskripsi telah diaktifkan tetapi kunci tidak diinisialisasi, silakan log-out dan log-in lagi"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Kunci privat tidak sah untuk Aplikasi Enskripsi. Silakan perbarui sandi kunci privat anda pada pengaturan pribadi untuk memulihkan akses ke berkas anda yang dienskripsi."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Unduhan Anda sedang disiapkan. Prosesnya dapat berlangsung agak lama jika ukuran berkasnya besar."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Galat saat memindahkan berkas"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Galat"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
@@ -299,12 +306,12 @@ msgstr "Dimodifikasi"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nama folder tidak sah. Menggunakan 'Shared' sudah digunakan."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s tidak dapat diubah nama"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Unggah"
 
@@ -340,72 +347,68 @@ msgstr "Ukuran masukan maksimum untuk berkas ZIP"
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Baru"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Berkas teks baru"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Berkas teks"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Map baru"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Dari tautan"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Berkas yang dihapus"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Batal pengunggahan"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Anda tidak memiliki akses untuk mengunggah atau membuat berkas disini"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Hapus"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Yang diunggah terlalu besar"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Berkas yang dicoba untuk diunggah melebihi ukuran maksimum pengunggahan berkas di server ini."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silakan tunggu."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Yang sedang dipindai"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Meningkatkan tembolok sistem berkas..."
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 7bc9584010..4a9069a529 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-08 01:55-0500\n"
-"PO-Revision-Date: 2014-01-07 07:40+0000\n"
-"Last-Translator: arifpedia <arifpedia@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,18 +81,18 @@ msgid ""
 "administrator"
 msgstr "Kesalahan tak dikenal, silakan periksa pengaturan sistem Anda atau hubungi admin."
 
-#: hooks/hooks.php:62
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Persyaratan yang hilang."
 
-#: hooks/hooks.php:63
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:281
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Pengguna berikut belum diatur untuk enkripsi:"
 
@@ -100,9 +100,9 @@ msgstr "Pengguna berikut belum diatur untuk enkripsi:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Menyimpan..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index 2ec650a917..a74f2ef2c4 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Akses diberikan"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Kesalahan dalam mengonfigurasi penyimpanan Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Berikan hak akses"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Masukkan kunci dan sandi aplikasi Dropbox yang benar."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Peringatan:</b> \"smbclient\" tidak terpasang. Mount direktori CIFS/SMB tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Peringatan:</b> Dukungan FTP di PHP tidak aktif atau tidak terpasang. Mount direktori FTP tidak dapat dilakukan. Silakan minta administrator sistem untuk memasangnya."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Pengguna"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Hapus"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Aktifkan Penyimpanan Eksternal Pengguna"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Izinkan pengguna untuk mengaitkan penyimpanan eksternal mereka"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Sertifikat root SSL"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Impor Sertifikat Root"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index c5659df948..e87d19ae3e 100644
--- a/l10n/id/files_sharing.po
+++ b/l10n/id/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-08 01:55-0500\n"
-"PO-Revision-Date: 2014-01-07 08:00+0000\n"
-"Last-Translator: arifpedia <arifpedia@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Dibagikan oleh {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Berbagi ini dilindungi sandi"
@@ -54,32 +58,16 @@ msgstr "berbagi dinonaktifkan"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s membagikan folder %s dengan Anda"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s membagikan berkas %s dengan Anda"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Unduh"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Unggah"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Batal unggah"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Tidak ada pratinjau yang tersedia untuk"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Tautan langsung"
diff --git a/l10n/id/files_trashbin.po b/l10n/id/files_trashbin.po
index 5f3ad858bd..bcd56f05f6 100644
--- a/l10n/id/files_trashbin.po
+++ b/l10n/id/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-08 01:55-0500\n"
-"PO-Revision-Date: 2014-01-07 07:10+0000\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,21 +17,25 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Tidak dapat menghapus permanen %s"
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Tidak dapat memulihkan %s"
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Berkas yang dihapus"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Galat"
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index c2c84a614c..77fcdde6fc 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-31 01:55-0500\n"
-"PO-Revision-Date: 2013-12-31 03:40+0000\n"
-"Last-Translator: arifpedia <arifpedia@gmail.com>\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,34 +17,34 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:245
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Apl \"%s\" tidak dapat diinstal karena tidak kompatibel dengan versi ownCloud."
 
-#: private/app.php:257
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Tidak ada nama apl yang ditentukan"
 
-#: private/app.php:362
+#: private/app.php:353
 msgid "Help"
 msgstr "Bantuan"
 
-#: private/app.php:375
+#: private/app.php:366
 msgid "Personal"
 msgstr "Pribadi"
 
-#: private/app.php:386
+#: private/app.php:377
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: private/app.php:398
+#: private/app.php:389
 msgid "Users"
 msgstr "Pengguna"
 
-#: private/app.php:411
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
@@ -61,15 +61,10 @@ msgstr "Tipe berkas tak dikenal"
 msgid "Invalid image"
 msgstr "Gambar tidak sah"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "layanan web dalam kendali anda"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "tidak dapat membuka \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Pengunduhan ZIP dimatikan."
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr "Silahkan unduh berkas secara terpisah dalam bentuk potongan kecil atau meminta ke administrator anda."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Tidak ada sumber yang ditentukan saat menginstal apl"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Href tidak ditentukan saat menginstal apl dari http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Lokasi tidak ditentukan saat menginstal apl dari berkas lokal"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Arsip dengan tipe %s tidak didukung"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Gagal membuka arsip saat menginstal apl"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Apl tidak menyediakan berkas info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Apl tidak dapat diinstal karena terdapat kode yang tidak diizinkan didalam Apl"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Apl tidak dapat diinstal karena tidak kompatibel dengan versi ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Apl tidak dapat diinstal karena mengandung tag <shipped>true</shipped> yang tidak diizinkan untuk apl yang bukan bawaan."
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Apl tidak dapat diinstal karena versi di info.xml/versi tidak sama dengan versi yang dilansir dari toko apl"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Direktori Apl sudah ada"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Tidak dapat membuat folder apl. Silakan perbaiki perizinan. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Aplikasi tidak diaktifkan"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Galat saat otentikasi"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token sudah kedaluwarsa. Silakan muat ulang halaman."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Berkas"
@@ -199,8 +198,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Anda harus memasukkan akun yang sudah ada atau administrator."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Nama pengguna dan/atau sandi MySQL tidak sah"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -227,21 +226,21 @@ msgstr "Perintah yang bermasalah: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Pengguna MySQL '%s'@'localhost' sudah ada."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Hapus pengguna ini dari MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Pengguna MySQL '%s'@'%%' sudah ada."
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Hapus pengguna ini dari MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -268,62 +267,68 @@ msgstr "Atur nama pengguna admin."
 msgid "Set an admin password."
 msgstr "Atur sandi admin."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Silakan periksa ulang <a href='%s'>panduan instalasi</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s membagikan »%s« dengan anda"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Tidak menemukan kategori \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n menit yang lalu"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n jam yang lalu"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "hari ini"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "kemarin"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n hari yang lalu"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n bulan yang lalu"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "beberapa tahun lalu"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 0b8a55abc7..6f7c733c33 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-08 01:55-0500\n"
-"PO-Revision-Date: 2014-01-07 08:10+0000\n"
-"Last-Translator: arifpedia <arifpedia@gmail.com>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email terkirim"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Enkripsi"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Tidak dapat memuat daftar dari App Store"
@@ -113,62 +155,90 @@ msgstr "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengg
 msgid "Unable to change password"
 msgstr "Tidak dapat mengubah sandi"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Dokumentasi Pengguna"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Perbarui ke {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Nonaktifkan"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aktifkan"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Mohon tunggu...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Galat saat menonaktifkan aplikasi"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Galat saat mengakifkan aplikasi"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Memperbarui...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Gagal ketika memperbarui aplikasi"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Galat"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Perbarui"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Diperbarui"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Pilih foto profil"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Menyimpan..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "dihapus"
@@ -181,40 +251,40 @@ msgstr "urungkan"
 msgid "Unable to remove user"
 msgstr "Tidak dapat menghapus pengguna"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grup"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Admin Grup"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Hapus"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "tambah grup"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Tuliskan nama pengguna yang valid"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Gagal membuat pengguna"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Tuliskan sandi yang valid"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Peringatan: Direktori home untuk pengguna \"{user}\"  sudah ada"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -238,18 +308,42 @@ msgstr "Galat dan masalah fatal"
 msgid "Fatal issues only"
 msgstr "Hanya masalah fatal"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Tidak ada"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Masuk"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Peringatan Keamanan"
 
-#: templates/admin.php:25
+#: 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 "Anda mengakses %s melalui HTTP. Kami sangat menyarankan Anda untuk mengkonfigurasi server dengan menggunakan HTTPS sebagai gantinya."
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr "Direktori data dan berkas Anda mungkin dapat diakses dari internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan untuk mengkonfigurasi server web Anda agar direktori data tidak lagi dapat diakses atau Anda dapat memindahkan direktori data di luar dokumen root webserver."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Peringatan Persiapan"
 
-#: templates/admin.php:53
+#: 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 "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Silakan periksa kembali <a href=\"%s\">petunjuk instalasi</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' tidak ada"
 
-#: templates/admin.php:68
+#: 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 "Module 'fileinfo' pada PHP tidak ada. Kami sangat menyarankan untuk mengaktifkan modul ini untuk mendapatkan hasil terbaik pada proses pendeteksian mime-type."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Versi PHP telah usang"
 
-#: templates/admin.php:82
+#: 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 "Versi PHP telah usang. Kami sangat menyarankan untuk diperbarui ke versi 5.3.8 atau yang lebih baru karena versi lama diketahui rusak. Ada kemungkinan bahwa instalasi ini tidak bekerja dengan benar."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Kode pelokalan tidak berfungsi"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Sistem lokal tidak dapat diatur untuk satu yang mendukung UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Ini artinya mungkin ada masalah dengan karakter tertentu pada nama berkas."
 
-#: templates/admin.php:106
+#: 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 "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Koneksi internet tidak berfungsi"
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Jalankan tugas setiap kali halaman dimuat"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php didaftarkan pada layanan webcron untuk memanggil cron.php setiap 15 menit melalui http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Menggunakan sistem layanan cron untuk memanggil berkas cron.php setiap 15 menit."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Berbagi"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktifkan API Pembagian"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Izinkan aplikasi untuk menggunakan API Pembagian"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Izinkan tautan"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Izinkan pengguna untuk berbagi item kepada publik lewat tautan"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Izinkan unggahan publik"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Izinkan pengguna memungkinkan orang lain untuk mengunggah kedalam folder berbagi publik mereka"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Izinkan pembagian ulang"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Izinkan pengguna untuk berbagi kembali item yang dibagikan kepada mereka."
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Izinkan pengguna untuk berbagi kepada siapa saja"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Hanya izinkan pengguna untuk berbagi dengan pengguna pada grup mereka sendiri"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Izinkan pemberitahuan email"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Izinkan pengguna mengirim pemberitahuan email pada berkas yang dibagikan"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Keamanan"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Selalu Gunakan HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Alamat server"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Catat"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Level pencatatan"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Lainnya"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Ciutkan"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versi"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +603,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Tambahkan Aplikasi Anda"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Aplikasi Lainnya"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Pilih Aplikasi"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman aplikasi di apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Dokumentasi Pengguna"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentasi Administrator"
@@ -506,7 +664,7 @@ msgstr "Tampilkan Penuntun Konfigurasi Awal"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Sandi"
 
@@ -518,151 +676,149 @@ msgstr "Sandi Anda telah diubah"
 msgid "Unable to change your password"
 msgstr "Gagal mengubah sandi Anda"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Sandi saat ini"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Sandi baru"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Ubah sandi"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Nama Lengkap"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Alamat email Anda"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Masukkan alamat email untuk mengaktifkan pemulihan sandi"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Foto profil"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Unggah baru"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Pilih baru dari Berkas"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Hapus gambar"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Bisa png atau jpg. Idealnya berbentuk persegi tetapi jika tidak Anda bisa memotongnya nanti."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Avatar disediakan oleh akun asli Anda."
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Batal"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Pilih sebagai gambar profil"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Bantu menerjemahkan"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Enkripsi"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Sandi masuk"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Deskripsi semua Berkas"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Nama Masuk"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Sandi pemulihan Admin"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Penyimpanan Baku"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Tak terbatas"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Lainnya"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nama pengguna"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Penyimpanan"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "ubah nama lengkap"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "setel sandi baru"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Baku"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index e90f580e2a..fcf502a7a8 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-08 01:55-0500\n"
-"PO-Revision-Date: 2014-01-07 07:10+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -86,43 +86,43 @@ msgstr "Sukses"
 msgid "Error"
 msgstr "Galat"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Pilih grup"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Tes koneksi sukses"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Tes koneksi gagal"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Anda ingin menghapus Konfigurasi Server saat ini?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Konfirmasi Penghapusan"
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr "Bantuan"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr "Atribut Pencarian Grup"
 msgid "Group-Member association"
 msgstr "asosiasi Anggota-Grup"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Atribut Khusus"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Bidang Kuota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Kuota Baku"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "dalam bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Bidang Email"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Aturan Penamaan Folder Home Pengguna"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index 1c607bd00f..8663a9a05e 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# arifpedia <arifpedia@gmail.com>, 2014
 # w41l <walecha99@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-01-10 15:01+0000\n"
+"Last-Translator: arifpedia <arifpedia@gmail.com>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,11 +25,11 @@ msgstr "Otentikasi WebDAV"
 
 #: templates/settings.php:4
 msgid "Address: "
-msgstr ""
+msgstr "Alamat:"
 
 #: templates/settings.php:7
 msgid ""
 "The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "Kredensial pengguna akan dikirim ke alamat ini. Pengaya ini memeriksa respon dan akan menafsirkan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid."
diff --git a/l10n/is/core.po b/l10n/is/core.po
index 24e272a5ed..42cbfba8d3 100644
--- a/l10n/is/core.po
+++ b/l10n/is/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -73,135 +59,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Sunnudagur"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Mánudagur"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Þriðjudagur"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Miðvikudagur"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Fimmtudagur"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Föstudagur"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Laugardagur"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Janúar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Febrúar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Apríl"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maí"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Júní"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Júlí"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Ágúst"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Október"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Nóvember"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Er að vista ..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sek."
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "í dag"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "í gær"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "mánuðir síðan"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "síðasta ári"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "einhverjum árum"
 
@@ -269,6 +259,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Deilt"
@@ -277,12 +287,12 @@ msgstr "Deilt"
 msgid "Share"
 msgstr "Deila"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Villa"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Villa við deilingu"
 
@@ -294,123 +304,123 @@ msgstr "Villa við að hætta deilingu"
 msgid "Error while changing permissions"
 msgstr "Villa við að breyta aðgangsheimildum"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Deilt með þér og hópnum {group} af {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Deilt með þér af {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Lykilorð"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Senda vefhlekk í tölvupóstu til notenda"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Senda"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Setja gildistíma"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Gildir til"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Deila með tölvupósti:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Engir notendur fundust"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Endurdeiling er ekki leyfð"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Deilt með {item} ásamt {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Hætta deilingu"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "getur breytt"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "aðgangsstýring"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "mynda"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "uppfæra"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "eyða"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "deila"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Verja með lykilorði"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Villa við að aftengja gildistíma"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Villa við að setja gildistíma"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sendi ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Tölvupóstur sendur"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Aðvörun"
 
@@ -457,11 +467,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uppfærslan heppnaðist. Beini þér til ownCloud nú."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}"
@@ -481,8 +497,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Notendanafn"
 
@@ -518,6 +534,18 @@ msgstr "Nýtt lykilorð"
 msgid "Reset password"
 msgstr "Endursetja lykilorð"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Um mig"
@@ -526,7 +554,7 @@ msgstr "Um mig"
 msgid "Users"
 msgstr "Notendur"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Forrit"
 
@@ -636,49 +664,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Útbúa <strong>vefstjóra aðgang</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Ítarlegt"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Gagnamappa"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Stilla gagnagrunn"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "verður notað"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Gagnagrunns notandi"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Gagnagrunns lykilorð"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nafn gagnagrunns"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Töflusvæði gagnagrunns"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Netþjónn gagnagrunns"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Virkja uppsetningu"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -694,7 +720,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Útskrá"
 
@@ -720,27 +746,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Týndir þú lykilorðinu?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "muna eftir mér"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "<strong>Skrá inn</strong>"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/is/files.po b/l10n/is/files.po
index ba1a0cc014..82f83fd1b1 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Gat ekki fært %s - Skrá með þessu nafni er þegar til"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Gat ekki fært %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Nafn skráar má ekki vera tómt"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Engin skrá var send inn. Óþekkt villa."
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Engin villa, innsending heppnaðist"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Innsend skrá er stærri en upload_max stillingin í php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Einungis hluti af innsendri skrá skilaði sér"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Engin skrá skilaði sér"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Vantar bráðabirgðamöppu"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Tókst ekki að skrifa á disk"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Ógild mappa."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Skrár"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Ekki nægt pláss tiltækt"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Hætt við innsendingu."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Innsending í gangi. Ef þú ferð af þessari síðu mun innsending misheppnast."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} er þegar til"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Deila"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Endurskýra"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Bíður"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaði {new_name} með {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' er ekki leyfilegt nafn."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Villa"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Stærð"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Breytt"
 
@@ -301,12 +308,12 @@ msgstr "Breytt"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Senda inn"
 
@@ -342,72 +349,68 @@ msgstr "Hámarks inntaksstærð fyrir ZIP skrár"
 msgid "Save"
 msgstr "Vista"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nýtt"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Texta skrá"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Mappa"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Af tengli"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Hætta við innsendingu"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hér. Settu eitthvað inn!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Niðurhal"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Innsend skrá er of stór"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Verið er að skima skrár, vinsamlegast hinkraðu."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Er að skima"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index d8f5c06d8c..599989d20e 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Er að vista ..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index aa54645b9c..27db470770 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Aðgengi veitt"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Villa við að setja upp Dropbox gagnasvæði"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Veita aðgengi"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Gefðu upp virkan Dropbox lykil og leynikóða"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Villa kom upp við að setja upp Google Drive gagnasvæði"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Aðvörun:</b> \"smbclient\" er ekki uppsettur. Uppsetning á CIFS/SMB gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Aðvörun:</b> FTP stuðningur í PHP er ekki virkur. Uppsetning á FTP gagnasvæðum er ekki möguleg. Hafðu samband við kerfisstjóra til að fá hann uppsettan."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Notendur"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Virkja ytra gagnasvæði notenda"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Leyfa notendum að bæta við sínum eigin ytri gagnasvæðum"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL rótar skilríki"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Flytja inn rótar skilríki"
diff --git a/l10n/is/files_sharing.po b/l10n/is/files_sharing.po
index cda2b8abd9..7e43bcdc42 100644
--- a/l10n/is/files_sharing.po
+++ b/l10n/is/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s deildi möppunni %s með þér"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s deildi skránni %s með þér"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Niðurhal"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Senda inn"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Hætta við innsendingu"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Yfirlit ekki í boði fyrir"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/is/files_trashbin.po b/l10n/is/files_trashbin.po
index 228fce21ec..72fed74a6d 100644
--- a/l10n/is/files_trashbin.po
+++ b/l10n/is/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Villa"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nafn"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Eyða"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 8bda5c5c8c..bbb36d9067 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hjálp"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Um mig"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Stillingar"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Notendur"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Stjórnun"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "vefþjónusta undir þinni stjórn"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Slökkt á ZIP niðurhali."
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Forrit ekki virkt"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Villa við auðkenningu"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Auðkenning útrunnin. Vinsamlegast skráðu þig aftur inn."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Skrár"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Fann ekki flokkinn \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sek."
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "í dag"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "í gær"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "síðasta mánuði"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "síðasta ári"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "einhverjum árum"
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 2ea8e49f9e..0d1a019ba8 100644
--- a/l10n/is/settings.po
+++ b/l10n/is/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Tölvupóstur sendur"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Dulkóðun"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Ekki tókst að hlaða lista frá forrita síðu"
@@ -114,61 +156,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Notenda handbók"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Gera óvirkt"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Virkja"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Andartak...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Uppfæri..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Villa"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Uppfæra"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Uppfært"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Er að vista ..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -182,40 +252,40 @@ msgstr "afturkalla"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Hópar"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Hópstjóri"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Eyða"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__nafn_tungumáls__"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ekkert"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Öryggis aðvörun"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Host nafn netþjóns"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Meira"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Minna"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Útgáfa"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +604,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Bæta við forriti"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Fleiri forrit"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Veldu forrit"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Skoða síðu forrits hjá apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-leyfi skráð af <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Notenda handbók"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Stjórnenda handbók"
@@ -507,7 +665,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Lykilorð"
 
@@ -519,151 +677,149 @@ msgstr "Lykilorði þínu hefur verið breytt"
 msgid "Unable to change your password"
 msgstr "Ekki tókst að breyta lykilorðinu þínu"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Núverandi lykilorð"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nýtt lykilorð"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Breyta lykilorði"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Netfang"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Netfangið þitt"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Hætta við"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Tungumál"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Hjálpa við þýðingu"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Dulkóðun"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Búa til"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Sjálfgefin gagnageymsla"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ótakmarkað"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Annað"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Notendanafn"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "gagnapláss"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Sjálfgefið"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 346a6ab1bd..df6247cd5d 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +87,43 @@ msgstr ""
 msgid "Error"
 msgstr "Villa"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -141,11 +141,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -163,7 +163,7 @@ msgstr "Hjálp"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -199,7 +199,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -267,7 +267,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -410,41 +410,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +470,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +489,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +515,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 4e82d96447..a58e08ae69 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -5,14 +5,14 @@
 # Translators:
 # nappo <leone@inventati.org>, 2013
 # idetao <marcxosm@gmail.com>, 2013
-# polxmod <paolo.velati@gmail.com>, 2013
-# Vincenzo Reale <vinx.reale@gmail.com>, 2013
+# Paolo Velati <paolo.velati@gmail.com>, 2013-2014
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-23 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 09:00+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,11 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s ha condiviso «%s» con te"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "La data di scadenza è nel passato."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Impossibile inviare email ai seguenti utenti: %s"
@@ -43,19 +42,6 @@ msgstr "Modalità di manutenzione disattivata"
 msgid "Updated database"
 msgstr "Database aggiornato"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Aggiornamento della cache dei file in corso, potrebbe richiedere molto tempo..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Cache dei file aggiornata"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% completato ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Non è stata fornita alcun immagine o file"
@@ -76,135 +62,139 @@ msgstr "Nessuna immagine di profilo provvisoria disponibile, riprova"
 msgid "No crop data provided"
 msgstr "Dati di ritaglio non forniti"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Domenica"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Lunedì"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Venerdì"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sabato"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Gennaio"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Febbraio"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Marzo"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Aprile"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maggio"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Giugno"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Luglio"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Settembre"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Ottobre"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Dicembre"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Salvataggio in corso..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuto fa"
 msgstr[1] "%n minuti fa"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ora fa"
 msgstr[1] "%n ore fa"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n giorno fa"
 msgstr[1] "%n giorni fa"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n mese fa"
 msgstr[1] "%n mesi fa"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "anni fa"
 
@@ -272,6 +262,26 @@ msgstr "({count} selezionati)"
 msgid "Error loading file exists template"
 msgstr "Errore durante il caricamento del modello del file esistente"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Password molto debole"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Password debole"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Password così-così"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Password buona"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Password forte"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Condivisi"
@@ -280,12 +290,12 @@ msgstr "Condivisi"
 msgid "Share"
 msgstr "Condividi"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Errore"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Errore durante la condivisione"
 
@@ -297,123 +307,123 @@ msgstr "Errore durante la rimozione della condivisione"
 msgid "Error while changing permissions"
 msgstr "Errore durante la modifica dei permessi"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Condiviso con te e con il gruppo {group} da {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Condiviso con te da {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Condividi con utente o gruppo ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Condividi collegamento"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Consenti caricamento pubblico"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Invia collegamento via email"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Imposta data di scadenza"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Condividi tramite email:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Non sono state trovate altre persone"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "gruppo"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "La ri-condivisione non è consentita"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Condiviso in {item} con {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "notifica tramite email"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "può modificare"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "controllo d'accesso"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "aggiornare"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "condividi"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Invio in corso..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Messaggio inviato"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Avviso"
 
@@ -460,11 +470,17 @@ msgstr "L'aggiornamento non è riuscito. Segnala il problema alla <a href=\"http
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "Ripristino password di %s"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Si è verificato un problema durante l'invio della email, contatta il tuo amministratore."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Usa il collegamento seguente per ripristinare la password: {link}"
@@ -484,8 +500,8 @@ msgstr "Richiesta non riuscita!<br>Sei sicuro che l'indirizzo di posta/nome uten
 msgid "You will receive a link to reset your password via Email."
 msgstr "Riceverai un collegamento per ripristinare la tua password via email"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nome utente"
 
@@ -521,6 +537,18 @@ msgstr "Nuova password"
 msgid "Reset password"
 msgstr "Ripristina la password"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personale"
@@ -529,7 +557,7 @@ msgstr "Personale"
 msgid "Users"
 msgstr "Utenti"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Applicazioni"
 
@@ -639,49 +667,47 @@ msgstr "Per informazioni su come configurare correttamente il tuo server, vedi l
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>account amministratore</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avanzat"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Archiviazione e database"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Cartella dati"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configura il database"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "sarà utilizzato"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Utente del database"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Password del database"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nome del database"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Spazio delle tabelle del database"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Host del database"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Completamento..."
 
@@ -697,7 +723,7 @@ msgstr "L'applicazione richiede che JavaScript sia abilitato per un corretto fun
 msgid "%s is available. Get more information on how to update."
 msgstr "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Esci"
 
@@ -723,28 +749,28 @@ msgstr "Autenticazione lato server non riuscita!"
 msgid "Please contact your administrator."
 msgstr "Contatta il tuo amministratore di sistema."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Hai perso la password?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "ricorda"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Accedi"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Accessi alternativi"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Ciao,<br><br>volevo informarti che %s ha condiviso %s con te.<br><a href=\"%s\">Vedi!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Ciao,<br><br>volevo informarti che %s ha condiviso <strong>%s</strong> con te.<br><a href=\"%s\">Guarda!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 888244240e..2b729d5096 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# polxmod <paolo.velati@gmail.com>, 2013
-# Vincenzo Reale <vinx.reale@gmail.com>, 2013
+# Paolo Velati <paolo.velati@gmail.com>, 2013-2014
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-24 01:55-0500\n"
-"PO-Revision-Date: 2013-12-22 22:30+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,283 +19,290 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Impossibile spostare %s - un file con questo nome esiste già"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Impossibile spostare %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Il nome del file non può essere vuoto."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Il nome del file non può contenere il carattere \"/\". Scegli un nome diverso."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" non è un nome file valido."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "La cartella di destinazione è stata spostata o eliminata."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Il nome %s è attualmente in uso nella cartella %s. Scegli un nome diverso."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Non è una sorgente valida"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Al server non è permesso aprire URL, controlla la configurazione del server"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Errore durante lo scaricamento di %s su %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Errore durante la creazione del file"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Il nome della cartella non può essere vuoto."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Il nome della cartella non può contenere il carattere \"/\". Scegli un nome diverso."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Errore durante la creazione della cartella"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Impossibile impostare una cartella di caricamento."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Token non valido"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, il file è stato caricato correttamente"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Il file caricato supera la direttiva upload_max_filesize in php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file è stato caricato solo parzialmente"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Nessun file è stato caricato"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Manca una cartella temporanea"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Scrittura su disco non riuscita"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Spazio di archiviazione insufficiente"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Caricamento non riuscito. Impossibile ottenere informazioni sul file."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Caricamento non riuscito. Impossibile trovare il file caricato."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Caricamento non riuscito. Impossibile ottenere informazioni sul file."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "File"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte."
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Spazio disponibile insufficiente"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "La dimensione totale del file {size1} supera il limite di caricamento {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Impossibile ottenere il risultato dal server."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "L'URL non può essere vuoto."
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Nella cartella home 'Shared' è un nome riservato"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste già"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Impossibile creare il file"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Impossibile creare la cartella"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Errore durante il recupero dello URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Condividi"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Elimina definitivamente"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "In corso"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Impossibile rinominare il file"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "sostituito {new_name} con {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Errore durante l'eliminazione del file."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n cartella"
 msgstr[1] "%n cartelle"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n file"
 msgstr[1] "%n file"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} e {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Caricamento di %n file in corso"
 msgstr[1] "Caricamento di %n file in corso"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' non è un nome file valido."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" non è un nome file valido."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "L'applicazione di cifratura è abilitata, ma le chiavi non sono state inizializzate, disconnettiti ed effettua nuovamente l'accesso"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Chiave privata non valida per l'applicazione di cifratura. Aggiorna la password della chiave privata nelle impostazioni personali per ripristinare l'accesso ai tuoi file cifrati."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Il tuo scaricamento è in fase di preparazione. Ciò potrebbe richiedere del tempo se i file sono grandi."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Errore durante lo spostamento del file"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Errore"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificato"
 
@@ -303,12 +310,12 @@ msgstr "Modificato"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nome della cartella non valido. L'uso di 'Shared' è riservato."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s non può essere rinominato"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Carica"
 
@@ -344,72 +351,68 @@ msgstr "Dimensione massima per i file ZIP"
 msgid "Save"
 msgstr "Salva"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nuovo"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Nuovo file di testo"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "File di testo"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Cartella"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Da collegamento"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "File eliminati"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Qui non hai i permessi di caricare o creare file"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'è niente qui. Carica qualcosa!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Caricamento troppo grande"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Scansione corrente"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Aggiornamento della cache del filesystem in corso..."
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index c77b29e41a..50a0f6c6ad 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # idetao <marcxosm@gmail.com>, 2013
-# polxmod <paolo.velati@gmail.com>, 2013
-# Vincenzo Reale <vinx.reale@gmail.com>, 2013
+# Paolo Velati <paolo.velati@gmail.com>, 2013-2014
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-03 06:40+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 22:50+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -83,18 +83,18 @@ msgid ""
 "administrator"
 msgstr "Errore sconosciuto, controlla le impostazioni di sistema o contatta il tuo amministratore"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Requisiti mancanti."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "I seguenti utenti non sono configurati per la cifratura:"
 
@@ -102,9 +102,9 @@ msgstr "I seguenti utenti non sono configurati per la cifratura:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Salvataggio in corso..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Cifratura iniziale in esecuzione... Riprova più tardi."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 4704f0c3cd..861c245c59 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -3,12 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Paolo Velati <paolo.velati@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 22:47+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -17,40 +18,44 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Accesso consentito"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Errore durante la configurazione dell'archivio Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Concedi l'accesso"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Fornisci chiave di applicazione e segreto di Dropbox validi."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Errore durante la configurazione dell'archivio Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Salvato"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Avviso:</b> \"smbclient\" non è installato. Impossibile montare condivisioni CIFS/SMB. Chiedi all'amministratore di sistema di installarlo."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Avviso:</b> il supporto FTP di PHP non è abilitato o non è installato. Impossibile montare condivisioni FTP. Chiedi all'amministratore di sistema di installarlo."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +107,22 @@ msgid "Users"
 msgstr "Utenti"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Abilita la memoria esterna dell'utente"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Consenti agli utenti di montare la propria memoria esterna"
+msgid "Allow users to mount the following external storage"
+msgstr "Consenti agli utenti di montare la seguente memoria esterna"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Certificati SSL radice"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importa certificato radice"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index bba679726f..98a37b856b 100644
--- a/l10n/it/files_sharing.po
+++ b/l10n/it/files_sharing.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# polxmod <paolo.velati@gmail.com>, 2013
+# Paolo Velati <paolo.velati@gmail.com>, 2013-2014
 # Vincenzo Reale <vinx.reale@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 22:47+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Condiviso da {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Questa condivione è protetta da password"
@@ -55,32 +59,16 @@ msgstr "la condivisione è disabilitata"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s ha condiviso la cartella %s con te"
+msgid "shared by %s"
+msgstr "condiviso da %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s ha condiviso il file %s con te"
+msgid "Download %s"
+msgstr "Scarica %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Scarica"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Carica"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Annulla il caricamento"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Nessuna anteprima disponibile per"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Collegamento diretto"
diff --git a/l10n/it/files_trashbin.po b/l10n/it/files_trashbin.po
index 05958ee8c9..2823cc284f 100644
--- a/l10n/it/files_trashbin.po
+++ b/l10n/it/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-16 03:12-0400\n"
+"PO-Revision-Date: 2014-03-15 07:00+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Impossibile eliminare %s definitivamente"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Impossibile ripristinare %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "File eliminati"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Errore"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "ripristinati"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Qui non c'è niente. Il tuo cestino è vuoto."
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nome"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Ripristina"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Eliminati"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "File eliminati"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 6fba55653f..5675eee56a 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # Francesco Capuano <francesco@capu.it>, 2013
-# polxmod <paolo.velati@gmail.com>, 2013
-# Vincenzo Reale <vinx.reale@gmail.com>, 2013
+# Paolo Velati <paolo.velati@gmail.com>, 2013-2014
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 22:52+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,38 +20,38 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "L'applicazione \"%s\" non può essere installata poiché non è compatibile con questa versione di ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Il nome dell'applicazione non è specificato"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Aiuto"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personale"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Utenti"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Aggiornamento non riuscito \"%s\"."
@@ -64,15 +64,10 @@ msgstr "Tipo di file sconosciuto"
 msgid "Invalid image"
 msgstr "Immagine non valida"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "impossibile aprire \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
@@ -95,74 +90,78 @@ msgid ""
 "administrator."
 msgstr "Scarica i file separatamente in blocchi più piccoli o chiedi al tuo amministratore."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Nessuna fonte specificata durante l'installazione dell'applicazione"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Nessun href specificato durante l'installazione dell'applicazione da http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Nessun percorso specificato durante l'installazione dell'applicazione da file locale"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Gli archivi di tipo %s non sono supportati"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Apertura archivio non riuscita durante l'installazione dell'applicazione"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "L'applicazione non fornisce un file info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "L'applicazione non può essere installata a causa di codice non consentito al suo interno"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che non è permesso alle applicazioni non shipped"
+msgstr "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che è consentito per le applicazioni native"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "La cartella dell'applicazione esiste già"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "L'applicazione  non è abilitata"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Errore di autenticazione"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token scaduto. Ricarica la pagina."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Utente sconosciuto"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "File"
@@ -202,8 +201,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "È necessario inserire un account esistente o l'amministratore."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Nome utente e/o password di MySQL non validi"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "Nome utente e/o password di MySQL/MariaDB non validi"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -230,21 +229,21 @@ msgstr "Il comando non consentito era: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "L'utente MySQL '%s'@'localhost' esiste già."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "L'utente MySQL/MariaDB '%s'@'localhost' esiste già."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Elimina questo utente da MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Elimina questo utente da MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "L'utente MySQL '%s'@'%%' esiste già"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "L'utente MySQL/MariaDB '%s'@'%%' esiste già"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Elimina questo utente da MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Elimina questo utente da MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -271,66 +270,72 @@ msgstr "Imposta un nome utente di amministrazione."
 msgid "Set an admin password."
 msgstr "Imposta una password di amministrazione."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s ha condiviso «%s» con te"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Impossibile trovare la categoria \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuto fa"
 msgstr[1] "%n minuti fa"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n ora fa"
 msgstr[1] "%n ore fa"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "oggi"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ieri"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n giorno fa"
 msgstr[1] "%n giorni fa"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "mese scorso"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n mese fa"
 msgstr[1] "%n mesi fa"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "anno scorso"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "anni fa"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index b972a97ad1..2edd7721bc 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -5,15 +5,15 @@
 # Translators:
 # Francesco Apruzzese <cescoap@gmail.com>, 2013
 # idetao <marcxosm@gmail.com>, 2013
-# polxmod <paolo.velati@gmail.com>, 2013
-# Vincenzo Reale <vinx.reale@gmail.com>, 2013
+# Paolo Velati <paolo.velati@gmail.com>, 2013-2014
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-24 01:55-0500\n"
-"PO-Revision-Date: 2013-12-22 22:30+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 12:01+0000\n"
+"Last-Translator: Paolo Velati <paolo.velati@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +21,48 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Valore non valido fornito per %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Salvato"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "prova impostazioni email"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email inviata"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Modalità di invio"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Cifratura"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Metodo di autenticazione"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Impossibile caricare l'elenco dall'App Store"
@@ -117,62 +159,90 @@ msgstr "Il motore non supporta la modifica della password, ma la chiave di cifra
 msgid "Unable to change password"
 msgstr "Impossibile cambiare la password"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Invio in corso..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Documentazione utente"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Documentazione di amministrazione"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Aggiorna a {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Disabilita"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Abilita"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Attendere..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Errore durante la disattivazione"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Errore durante l'attivazione"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Aggiornamento in corso..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Errore durante l'aggiornamento"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Errore"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Aggiorna"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Aggiornato"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Seleziona un'immagine del profilo"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Password molto debole"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Password debole"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Password così-così"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Password buona"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Password forte"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Salvataggio in corso..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "eliminati"
@@ -185,40 +255,40 @@ msgstr "annulla"
 msgid "Unable to remove user"
 msgstr "Impossibile rimuovere l'utente"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Gruppi"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Gruppi amministrati"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Elimina"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "aggiungi gruppo"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Deve essere fornito un nome utente valido"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Errore durante la creazione dell'utente"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Deve essere fornita una password valida"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Avviso: la cartella home dell'utente \"{user}\" esiste già"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Italiano"
 
@@ -242,18 +312,42 @@ msgstr "Errori e problemi gravi"
 msgid "Fatal issues only"
 msgstr "Solo problemi gravi"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Nessuno"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Accesso"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Semplice"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "Gestore NT LAN"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Avviso di sicurezza"
 
-#: templates/admin.php:25
+#: 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 "Sei connesso a %s tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere l'utilizzo del protocollo HTTPS al posto di HTTP."
 
-#: templates/admin.php:39
+#: 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 "
@@ -262,68 +356,68 @@ msgid ""
 "root."
 msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o spostare la cartella fuori dalla radice del server web."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Avviso di configurazione"
 
-#: templates/admin.php:53
+#: 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 "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Leggi attentamente le <a href='%s'>guide d'installazione</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modulo 'fileinfo' mancante"
 
-#: templates/admin.php:68
+#: 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 "Il modulo PHP 'fileinfo' non è presente. Consigliamo vivamente di abilitare questo modulo per ottenere risultati migliori con il rilevamento dei tipi MIME."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "La tua versione di PHP è obsoleta"
 
-#: templates/admin.php:82
+#: 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 "La tua versione di PHP è obsoleta. Ti consigliamo vivamente di aggiornare alla versione 5.3.8 o successiva poiché è sono noti problemi con le vecchie versioni. L'installazione attuale potrebbe non funzionare correttamente."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Locale non funzionante"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "La localizzazione di sistema non può essere impostata a una che supporta UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Ciò significa che potrebbero esserci problemi con alcuni caratteri nei nomi dei file."
 
-#: templates/admin.php:106
+#: 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 "Consigliamo vivamente di installare i pacchetti richiesti sul tuo sistema per supportare una delle\nlocalizzazioni seguenti: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Concessione Internet non funzionante"
 
-#: templates/admin.php:121
+#: 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 "
@@ -332,118 +426,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Questo server ownCloud non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "L'ultimo cron è stato eseguito alle %s."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "L'ultimo cron è stato eseguito alle %s. È più di un ora fa, qualcosa sembra sbagliato."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron non è ancora stato eseguito!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Esegui un'operazione con ogni pagina caricata"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Condivisione"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Abilita API di condivisione"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Consenti collegamenti"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Consenti agli utenti di condividere pubblicamente elementi tramite collegamenti"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Consenti caricamenti pubblici"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Consenti agli utenti di abilitare altri al caricamento nelle loro cartelle pubbliche condivise"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Consenti la ri-condivisione"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Consenti agli utenti di condividere a loro volta elementi condivisi da altri"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Consenti agli utenti di condividere con chiunque"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Consenti agli utenti di condividere solo con utenti dei loro gruppi"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Consenti le notifiche tramite posta elettronica"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Consenti all'utente di inviare notifiche tramite posta elettronica per i file condivisi"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Protezione"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forza HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forza i client a connettersi a %s tramite una connessione cifrata."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Server di posta"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Viene utilizzato per inviare le notifiche."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Indirizzo mittente"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Autenticazione richiesta"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Indirizzo del server"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Porta"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Credenziali"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "Nome utente SMTP"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "Password SMTP"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Prova impostazioni email"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Invia email"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Livello di log"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Altro"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Meno"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versione"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -453,30 +607,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Aggiungi la tua applicazione"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Altre applicazioni"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Seleziona un'applicazione"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Documentazione:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Vedere la pagina dell'applicazione su apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Visita il sito web dell'applicazione"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Documentazione utente"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentazione amministratore"
@@ -510,7 +668,7 @@ msgstr "Mostra nuovamente la procedura di primo avvio"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Password"
 
@@ -522,151 +680,149 @@ msgstr "La tua password è cambiata"
 msgid "Unable to change your password"
 msgstr "Modifica password non riuscita"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Password attuale"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nuova password"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Modifica password"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Posta elettronica"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Il tuo indirizzo email"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Inserisci il tuo indirizzo email per abilitare il recupero della password"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Inserisci il tuo indirizzo di posta per abilitare il recupero della password e ricevere notifiche"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Immagine del profilo"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Carica nuova"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Seleziona nuova da file"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Rimuovi immagine"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Il tuo avatar è ottenuto dal tuo account originale."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Interrompi"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Annulla"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Scegli come immagine del profilo"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Lingua"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Migliora la traduzione"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Cifratura"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Password di accesso"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Decifra tutti i file"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Nome utente"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Password di ripristino amministrativa"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password."
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Archiviazione predefinita"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Illimitata"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Altro"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nome utente"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Archiviazione"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "modica nome completo"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "imposta una nuova password"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Predefinito"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index dbe65895ef..da54354cf9 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# polxmod <paolo.velati@gmail.com>, 2013
-# Vincenzo Reale <vinx.reale@gmail.com>, 2013
+# Paolo Velati <paolo.velati@gmail.com>, 2013
+# Vincenzo Reale <vinx.reale@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,43 +88,43 @@ msgstr "Riuscito"
 msgid "Error"
 msgstr "Errore"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Configurazione corretta"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Configurazione non corretta"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Configurazione incompleta"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Seleziona i gruppi"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Seleziona le classi di oggetti"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Seleziona gli attributi"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Prova di connessione riuscita"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Prova di connessione non riuscita"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vuoi davvero eliminare la configurazione attuale del server?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Conferma l'eliminazione"
 
@@ -142,11 +142,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s utente trovato"
 msgstr[1] "%s utenti trovati"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Host non valido"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Impossibile trovare la funzionalità desiderata"
 
@@ -164,8 +164,8 @@ msgstr "Aiuto"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Limita l'accesso a %s ai gruppi che verificano questi criteri:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "I gruppi che corrispondono a questi criteri sono disponibili in %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -200,8 +200,8 @@ msgid "groups found"
 msgstr "gruppi trovati"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Quale attributo deve essere usato come nome di accesso:"
+msgid "Users login with this attribute:"
+msgstr "Utenti con questo attributo:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -268,7 +268,7 @@ msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Ava
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr "Limita l'accesso a %s ai gruppi che verificano questi criteri:"
 
 #: templates/part.wizard-userfilter.php:31
@@ -411,41 +411,51 @@ msgstr "Attributi di ricerca gruppo"
 msgid "Group-Member association"
 msgstr "Associazione gruppo-utente "
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Gruppi nidificati"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Quando è attivato, i gruppi che contengono altri gruppi sono supportati. (Funziona solo se l'attributo del gruppo membro contiene DN.)"
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Attributi speciali"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Campo Quota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Quota predefinita"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "in byte"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Campo Email"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Regola di assegnazione del nome della cartella utente"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Nome utente interno"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà aggiunto/incrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una parte di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti)."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Attributo nome utente interno:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Ignora rilevamento UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti)."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Attributo UUID per gli utenti:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Attributo UUID per i gruppi:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Associazione Nome utente-Utente LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno è utilizzato dappertutto. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Cancella associazione Nome utente-Utente LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Cancella associazione Nome gruppo-Gruppo LDAP"
diff --git a/l10n/ja_JP/core.po b/l10n/ja/core.po
similarity index 74%
rename from l10n/ja_JP/core.po
rename to l10n/ja/core.po
index 63923cbb96..3876516000 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja/core.po
@@ -3,18 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
-# plazmism <gomidori@live.jp>, 2013
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
+# plazmism <gomidori@live.jp>, 2013-2014
 # iLikeIT <dj_dark_junglist@yahoo.com>, 2013
 # Koichi MATSUMOTO <mzch@me.com>, 2013
-# tt yn <tetuyano+transi@gmail.com>, 2013
+# kuromabo <md81bird@hitaki.net>, 2014
+# tt yn <tetuyano+transi@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-25 01:55-0500\n"
-"PO-Revision-Date: 2013-12-24 08:10+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,15 +23,14 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%sが あなたと »%s«を共有しました"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr "次のユーザにメールを送信できませんでした: %s"
+msgstr "次のユーザーにメールを送信できませんでした: %s"
 
 #: ajax/update.php:11
 msgid "Turned on maintenance mode"
@@ -44,19 +44,6 @@ msgstr "メンテナンスモードがオフになりました"
 msgid "Updated database"
 msgstr "データベース更新完了"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "ファイルキャッシュを更新しています、しばらく掛かる恐れがあります..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "ファイルキャッシュ更新完了"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% 完了 ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "画像もしくはファイルが提供されていません"
@@ -71,137 +58,141 @@ msgstr "無効な画像"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
-msgstr "一時的なプロファイル用画像が利用できません。もう一度試して下さい"
+msgstr "一時的なプロファイル用画像が利用できません。もう一度試してください"
 
 #: avatar/controller.php:135
 msgid "No crop data provided"
 msgstr "クロップデータは提供されません"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "日"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "月"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "火"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "水"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "木"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "金"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "土"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "1月"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "2月"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "3月"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "4月"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "5月"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "6月"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "7月"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "8月"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "9月"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "10月"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "11月"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "12月"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "保存中..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "数秒前"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分前"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 時間前"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] "%n 日前"
+msgstr[0] "%n日前"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
-msgstr "一月前"
+msgstr "1ヶ月前"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] "%n ヶ月前"
+msgstr[0] "%nヶ月前"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "数ヶ月前"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
-msgstr "一年前"
+msgstr "1年前"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "数年前"
 
@@ -268,6 +259,26 @@ msgstr "({count} 選択)"
 msgid "Error loading file exists template"
 msgstr "既存ファイルのテンプレートの読み込みエラー"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "非常に弱いパスワード"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "弱いパスワード"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "まずまずのパスワード"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "良好なパスワード"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "強いパスワード"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "共有中"
@@ -276,12 +287,12 @@ msgstr "共有中"
 msgid "Share"
 msgstr "共有"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "エラー"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "共有でエラー発生"
 
@@ -293,129 +304,129 @@ msgstr "共有解除でエラー発生"
 msgid "Error while changing permissions"
 msgstr "権限変更でエラー発生"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "あなたと {owner} のグループ {group} で共有中"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner} と共有中"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
-msgstr "ユーザもしくはグループと共有 ..."
+msgstr "ユーザーもしくはグループと共有 ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "URLで共有"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "パスワード保護"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "パスワード"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "アップロードを許可"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "メールリンク"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "送信"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "有効期限を設定"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "有効期限"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "メール経由で共有:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "ユーザーが見つかりません"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "グループ"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "再共有は許可されていません"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "{item} 内で {user} と共有中"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "共有解除"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "メールで通知"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "編集を許可"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "アクセス権限"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "作成"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
-msgstr "更新"
+msgstr "アップデート"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "削除"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "共有"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "パスワード保護"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "有効期限の未設定エラー"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "有効期限の設定でエラー発生"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "送信中..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "メールを送信しました"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "警告"
 
 #: js/tags.js:4
 msgid "The object type is not specified."
-msgstr "オブジェクタイプが指定されていません。"
+msgstr "オブジェクトタイプが指定されていません。"
 
 #: js/tags.js:13
 msgid "Enter new"
@@ -450,38 +461,44 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr "更新に成功しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。"
+msgstr "アップデートに失敗しました。この問題を <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a> にレポートしてください。"
 
 #: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "更新に成功しました。今すぐownCloudにリダイレクトします。"
+msgstr "アップデートに成功しました。今すぐownCloudにリダイレクトします。"
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s パスワードリセット"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "メールの送信中に問題が発生しました。管理者に問い合わせください。"
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "パスワードをリセットするには次のリンクをクリックして下さい: {link}"
+msgstr "パスワードをリセットするには次のリンクをクリックしてください: {link}"
 
 #: lostpassword/templates/lostpassword.php:7
 msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr "パスワードリセットのリンクをあなたのメールアドレスに送信しました。<br>しばらくたっても受信出来ない場合は、スパム／迷惑メールフォルダを確認して下さい。<br>もしそこにもない場合は、管理者に問い合わせてください。"
+msgstr "パスワードリセットのリンクをあなたのメールアドレスに送信しました。<br>しばらくたっても受信できない場合は、スパム／迷惑メールフォルダーを確認してください。<br>もしそこにもない場合は、管理者に問い合わせてください。"
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr "リクエストに失敗しました！<br>あなたのメール／ユーザ名が正しいことを確認しましたか？"
+msgstr "リクエストに失敗しました！<br>あなたのメール／ユーザー名が正しいことを確認しましたか？"
 
 #: lostpassword/templates/lostpassword.php:18
 msgid "You will receive a link to reset your password via Email."
 msgstr "メールでパスワードをリセットするリンクが届きます。"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "ユーザー名"
 
@@ -491,7 +508,7 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr "ファイルが暗号化されています。復旧キーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？"
+msgstr "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Yes, I really want to reset my password now"
@@ -517,15 +534,27 @@ msgstr "新しいパスワードを入力"
 msgid "Reset password"
 msgstr "パスワードをリセット"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "個人"
 
 #: strings.php:6
 msgid "Users"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "アプリ"
 
@@ -604,13 +633,13 @@ msgstr "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)
 #: templates/installation.php:27
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr "%s を安全に利用する為に インストールされているPHPをアップデートしてください。"
+msgstr "%s を安全に利用するため、インストールされているPHPをアップデートしてください。"
 
 #: templates/installation.php:33
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。"
+msgstr "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にしてください。"
 
 #: templates/installation.php:34
 msgid ""
@@ -635,65 +664,63 @@ msgstr "サーバーを適正に設定する情報は、こちらの<a href=\"%s
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>管理者アカウント</strong>を作成してください"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "詳細設定"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "ストレージとデータベース"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
-msgstr "データフォルダ"
+msgstr "データフォルダー"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "データベースを設定してください"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "が使用されます"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
-msgstr "データベースのユーザ名"
+msgstr "データベースのユーザー名"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "データベースのパスワード"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "データベース名"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "データベースの表領域"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "データベースのホスト名"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
-msgstr "終了しています ..."
+msgstr "作業を完了しています ..."
 
 #: templates/layout.user.php:40
 msgid ""
 "This application requires JavaScript to be enabled for correct operation.  "
 "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
 "JavaScript</a> and re-load this interface."
-msgstr "このアプリケーションは使用する為、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、インターフェースを更新してください。 "
+msgstr "このアプリケーションを使用するにはJavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、インターフェースを更新してください。 "
 
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr "%s が利用可能です。更新方法に関してさらに情報を取得して下さい。"
+msgstr "%s が利用可能です。アップデート方法について詳細情報を確認してください。"
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "ログアウト"
 
@@ -705,46 +732,46 @@ msgstr "自動ログインは拒否されました！"
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "最近パスワードを変更していない場合、あなたのアカウントは危険にさらされているかもしれません。"
+msgstr "最近パスワードを変更していない場合、あなたのアカウントが危険にさらされている可能性があります!"
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr "アカウント保護の為、パスワードを再度の変更をお願いいたします。"
+msgstr "アカウント保護のため、パスワードを再度変更してください。"
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
-msgstr "サーバサイドの認証に失敗しました！"
+msgstr "サーバーサイドの認証に失敗しました！"
 
 #: templates/login.php:18
 msgid "Please contact your administrator."
 msgstr "管理者に問い合わせてください。"
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "パスワードを忘れましたか？"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
-msgstr "自動ログインする"
+msgstr "パスワードを保存"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "ログイン"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "代替ログイン"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
-msgstr "この ownCloud インスタンスは、現在シングルユーザモードです。"
+msgstr "このownCloudインスタンスは、現在シングルユーザーモードです。"
 
 #: templates/singleuser.user.php:4
 msgid "This means only administrators can use the instance."
@@ -763,12 +790,12 @@ msgstr "しばらくお待ちください。"
 #: templates/update.admin.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。"
+msgstr "ownCloud をバージョン %s に更新しています、しばらくお待ちください。"
 
 #: templates/update.user.php:3
 msgid ""
 "This ownCloud instance is currently being updated, which may take a while."
-msgstr "この ownCloud インスタンスは現在更新中であり、しばらく時間がかかります。"
+msgstr "この ownCloud インスタンスは現在アップデート中のため、しばらく時間がかかります。"
 
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
diff --git a/l10n/ja_JP/files.po b/l10n/ja/files.po
similarity index 68%
rename from l10n/ja_JP/files.po
rename to l10n/ja/files.po
index e8b99a951c..02c744dddc 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja/files.po
@@ -4,18 +4,19 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
-# plazmism <gomidori@live.jp>, 2013
+# plazmism <gomidori@live.jp>, 2013-2014
 # iLikeIT <dj_dark_junglist@yahoo.com>, 2013
 # Koichi MATSUMOTO <mzch@me.com>, 2013
+# kuromabo <md81bird@hitaki.net>, 2014
 # pabook <pabook.32@gmail.com>, 2013
 # tt yn <tetuyano+transi@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-04 01:55-0500\n"
-"PO-Revision-Date: 2014-01-03 14:10+0000\n"
-"Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,293 +24,300 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "%s を移動できませんでした ― この名前のファイルはすでに存在します"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "%s を移動できませんでした"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "ファイル名を空にすることはできません。"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "ファイル名には \"/\" を含めることはできません。別の名前を選択してください。"
-
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:63
 #, php-format
-msgid ""
-"The name %s is already used in the folder %s. Please choose a different "
-"name."
-msgstr "%s はフォルダ %s ないですでに使われています。別の名前を選択してください。"
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" は無効なファイル名です。"
 
-#: ajax/newfile.php:81
-msgid "Not a valid source"
-msgstr "有効なソースではありません"
-
-#: ajax/newfile.php:86
-msgid ""
-"Server is not allowed to open URLs, please check the server configuration"
-msgstr "サーバーは、URLを開くことは許されません。サーバーの設定をチェックしてください。"
-
-#: ajax/newfile.php:103
-#, php-format
-msgid "Error while downloading %s to %s"
-msgstr "%s から %s へのダウンロードエラー"
-
-#: ajax/newfile.php:140
-msgid "Error when creating the file"
-msgstr "ファイルの生成エラー"
-
-#: ajax/newfolder.php:21
-msgid "Folder name cannot be empty."
-msgstr "フォルダ名は空にできません"
-
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "フォルダ名には \"/\" を含めることはできません。別の名前を選択してください。"
-
-#: ajax/newfolder.php:56
-msgid "Error when creating the folder"
-msgstr "フォルダの生成エラー"
-
-#: ajax/upload.php:18 ajax/upload.php:50
-msgid "Unable to set upload directory."
-msgstr "アップロードディレクトリを設定出来ません。"
-
-#: ajax/upload.php:27
-msgid "Invalid Token"
-msgstr "無効なトークン"
-
-#: ajax/upload.php:64
-msgid "No file was uploaded. Unknown error"
-msgstr "ファイルは何もアップロードされていません。不明なエラー"
-
-#: ajax/upload.php:71
-msgid "There is no error, the file uploaded with success"
-msgstr "エラーはありません。ファイルのアップロードは成功しました"
-
-#: ajax/upload.php:72
-msgid ""
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:"
-
-#: ajax/upload.php:74
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています"
-
-#: ajax/upload.php:75
-msgid "The uploaded file was only partially uploaded"
-msgstr "アップロードファイルは一部分だけアップロードされました"
-
-#: ajax/upload.php:76
-msgid "No file was uploaded"
-msgstr "ファイルはアップロードされませんでした"
-
-#: ajax/upload.php:77
-msgid "Missing a temporary folder"
-msgstr "一時保存フォルダが見つかりません"
-
-#: ajax/upload.php:78
-msgid "Failed to write to disk"
-msgstr "ディスクへの書き込みに失敗しました"
-
-#: ajax/upload.php:96
-msgid "Not enough storage available"
-msgstr "ストレージに十分な空き容量がありません"
-
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "アップロードに失敗。ファイル情報を取得できませんでした。"
-
-#: ajax/upload.php:144
-msgid "Upload failed. Could not find uploaded file"
-msgstr "アップロードに失敗。アップロード済みのファイルを見つけることができませんでした。"
-
-#: ajax/upload.php:172
-msgid "Invalid directory."
-msgstr "無効なディレクトリです。"
-
-#: appinfo/app.php:11
-msgid "Files"
-msgstr "ファイル"
-
-#: js/file-upload.js:228
-msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr "ディレクトリもしくは0バイトのため {filename} をアップロードできません"
-
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "利用可能なスペースが十分にありません"
-
-#: js/file-upload.js:306
-msgid "Upload cancelled."
-msgstr "アップロードはキャンセルされました。"
-
-#: js/file-upload.js:344
-msgid "Could not get result from server."
-msgstr "サーバから結果を取得できませんでした。"
-
-#: js/file-upload.js:436
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
-
-#: js/file-upload.js:523
-msgid "URL cannot be empty"
-msgstr "URL は空にできません"
-
-#: js/file-upload.js:527 js/filelist.js:377
-msgid "In the home folder 'Shared' is a reserved filename"
-msgstr "ホームフォルダでは、'Shared' はシステムが使用する予約済みのファイル名です"
-
-#: js/file-upload.js:529 js/filelist.js:379
-msgid "{new_name} already exists"
-msgstr "{new_name} はすでに存在しています"
-
-#: js/file-upload.js:595
-msgid "Could not create file"
-msgstr "ファイルを作成できませんでした"
-
-#: js/file-upload.js:611
-msgid "Could not create folder"
-msgstr "フォルダを作成できませんでした"
-
-#: js/file-upload.js:661
-msgid "Error fetching URL"
-msgstr "URL取得エラー"
-
-#: js/fileactions.js:125
-msgid "Share"
-msgstr "共有"
-
-#: js/fileactions.js:137
-msgid "Delete permanently"
-msgstr "完全に削除する"
-
-#: js/fileactions.js:194
-msgid "Rename"
-msgstr "名前の変更"
-
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
-msgid "Pending"
-msgstr "中断"
-
-#: js/filelist.js:405
-msgid "Could not rename file"
-msgstr "ファイルの名前変更ができませんでした"
-
-#: js/filelist.js:539
-msgid "replaced {new_name} with {old_name}"
-msgstr "{old_name} を {new_name} に置換"
-
-#: js/filelist.js:539
-msgid "undo"
-msgstr "元に戻す"
-
-#: js/filelist.js:591
-msgid "Error deleting file."
-msgstr "ファイルの削除エラー。"
-
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n 個のフォルダ"
-
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n 個のファイル"
-
-#: js/filelist.js:617
-msgid "{dirs} and {files}"
-msgstr "{dirs} と {files}"
-
-#: js/filelist.js:828 js/filelist.js:866
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
-msgstr[0] "%n 個のファイルをアップロード中"
-
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' は無効なファイル名です。"
-
-#: js/files.js:81
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。"
 
-#: js/files.js:93
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "目標のフォルダは移動されたか、削除されました。"
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr "%s はフォルダー %s ですでに使われています。別の名前を選択してください。"
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr "有効なソースではありません"
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr "サーバーは、URLを開くことは許されません。サーバーの設定をチェックしてください。"
+
+#: ajax/newfile.php:119
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr "%s から %s へのダウンロードエラー"
+
+#: ajax/newfile.php:156
+msgid "Error when creating the file"
+msgstr "ファイルの生成エラー"
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr "フォルダー名は空にできません"
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr "フォルダーの生成エラー"
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr "アップロードディレクトリを設定できません。"
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr "無効なトークン"
+
+#: ajax/upload.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr "ファイルは何もアップロードされていません。不明なエラー"
+
+#: ajax/upload.php:78
+msgid "There is no error, the file uploaded with success"
+msgstr "エラーはありません。ファイルのアップロードは成功しました"
+
+#: ajax/upload.php:79
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:"
+
+#: ajax/upload.php:81
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています"
+
+#: ajax/upload.php:82
+msgid "The uploaded file was only partially uploaded"
+msgstr "アップロードファイルは一部分だけアップロードされました"
+
+#: ajax/upload.php:83
+msgid "No file was uploaded"
+msgstr "ファイルはアップロードされませんでした"
+
+#: ajax/upload.php:84
+msgid "Missing a temporary folder"
+msgstr "一時保存フォルダーが見つかりません"
+
+#: ajax/upload.php:85
+msgid "Failed to write to disk"
+msgstr "ディスクへの書き込みに失敗しました"
+
+#: ajax/upload.php:103
+msgid "Not enough storage available"
+msgstr "ストレージに十分な空き容量がありません"
+
+#: ajax/upload.php:160
+msgid "Upload failed. Could not find uploaded file"
+msgstr "アップロードに失敗。アップロード済みのファイルを見つけることができませんでした。"
+
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "アップロードに失敗。ファイル情報を取得できませんでした。"
+
+#: ajax/upload.php:189
+msgid "Invalid directory."
+msgstr "無効なディレクトリです。"
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr "ファイル"
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "ディレクトリもしくは0バイトのため {filename} をアップロードできません"
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。"
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。"
+
+#: js/file-upload.js:340
+msgid "Upload cancelled."
+msgstr "アップロードはキャンセルされました。"
+
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr "サーバーから結果を取得できませんでした。"
+
+#: js/file-upload.js:477
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
+
+#: js/file-upload.js:564
+msgid "URL cannot be empty"
+msgstr "URL は空にできません"
+
+#: js/file-upload.js:568
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr "ホームフォルダーでは、'Shared' はシステムが使用する予約済みのファイル名です"
+
+#: js/file-upload.js:570 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr "{new_name} はすでに存在します"
+
+#: js/file-upload.js:636
+msgid "Could not create file"
+msgstr "ファイルを作成できませんでした"
+
+#: js/file-upload.js:652
+msgid "Could not create folder"
+msgstr "フォルダーを作成できませんでした"
+
+#: js/file-upload.js:702
+msgid "Error fetching URL"
+msgstr "URL取得エラー"
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr "共有"
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr "完全に削除する"
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr "名前の変更"
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr "中断"
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr "ファイルの名前変更ができませんでした"
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr "{old_name} を {new_name} に置換"
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr "元に戻す"
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr "ファイルの削除エラー。"
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n 個のフォルダー"
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n 個のファイル"
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr "{dirs} と {files}"
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "%n 個のファイルをアップロード中"
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" は無効なファイル名です。"
+
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "あなたのストレージはほぼ一杯です（{usedSpacePercent}%）"
+msgstr "ストレージがほぼ一杯です（{usedSpacePercent}%）"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。"
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。"
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "ダウンロードの準備中です。ファイルサイズが大きい場合は少し時間がかかるかもしれません。"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "ファイルの移動エラー"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "エラー"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "名前"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "更新日時"
 
 #: lib/app.php:60
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
-msgstr "無効なフォルダ名。「Shared」の利用は予約されています。"
+msgstr "無効なフォルダー名。「Shared」の利用は予約されています。"
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%sの名前を変更できませんでした"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "アップロード"
 
@@ -327,7 +335,7 @@ msgstr "最大容量: "
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "複数ファイルおよびフォルダのダウンロードに必要"
+msgstr "複数ファイルおよびフォルダーのダウンロードに必要"
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
@@ -339,78 +347,74 @@ msgstr "0を指定した場合は無制限"
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
-msgstr "ZIPファイルへの最大入力サイズ"
+msgstr "ZIPファイルでの最大入力サイズ"
 
 #: templates/admin.php:26
 msgid "Save"
 msgstr "保存"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "新規作成"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "新規のテキストファイル作成"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "テキストファイル"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
-msgstr "新しいフォルダ"
+msgstr "新しいフォルダー"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
-msgstr "フォルダ"
+msgstr "フォルダー"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "リンク"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "ゴミ箱"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "アップロードをキャンセル"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "ここにファイルをアップロードもしくは作成する権限がありません"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "ここには何もありません。何かアップロードしてください。"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "削除"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "アップロードには大きすぎます。"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。"
+msgstr "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "ファイルをスキャンしています、しばらくお待ちください。"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "スキャン中"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "ファイルシステムキャッシュを更新中..."
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja/files_encryption.po
similarity index 82%
rename from l10n/ja_JP/files_encryption.po
rename to l10n/ja/files_encryption.po
index 9089a6f117..4e73f59715 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja/files_encryption.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
-# plazmism <gomidori@live.jp>, 2013
+# plazmism <gomidori@live.jp>, 2013-2014
+# kuromabo <md81bird@hitaki.net>, 2014
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 03:50+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
+"PO-Revision-Date: 2014-03-11 13:11+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,12 +23,12 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr "リカバリ用のキーは正常に有効化されました"
+msgstr "リカバリ用のキーを正常に有効にしました"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認して下さい！"
+msgstr "リカバリ用のキーを有効にできませんでした。リカバリ用のキーのパスワードを確認してください！"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
@@ -36,7 +37,7 @@ msgstr "リカバリ用のキーを正常に無効化しました"
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認して下さい！"
+msgstr "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -61,7 +62,7 @@ msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr "暗号化アプリが初期化されていません。暗号化アプリが接続中に再度有効かされた可能性があります。暗号化アプリを初期化する為に、１回ログアウトしてログインしなおしてください。"
+msgstr "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。"
 
 #: files/error.php:16
 #, php-format
@@ -83,28 +84,28 @@ msgid ""
 "administrator"
 msgstr "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "必要要件が満たされていません。"
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。"
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "以下のユーザーは、暗号化設定がされていません："
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。今しばらくお待ちください。"
+msgstr "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。お待ちください。"
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "保存中..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "初期暗号化実行中... 後でもう一度お試しください。"
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
@@ -121,15 +122,15 @@ msgstr "暗号化"
 #: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr "復旧キーを有効化 (万一パスワードを亡くした場合もユーザーのファイルを回復できる):"
+msgstr "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):"
 
 #: templates/settings-admin.php:11
 msgid "Recovery key password"
-msgstr "復旧キーのパスワード"
+msgstr "リカバリキーのパスワード"
 
 #: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr "復旧キーのパスワードをもう一度入力"
+msgstr "リカバリキーのパスワードをもう一度入力"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
@@ -141,19 +142,19 @@ msgstr "無効"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr "復旧キーのパスワードを変更:"
+msgstr "リカバリキーのパスワードを変更:"
 
 #: templates/settings-admin.php:40
 msgid "Old Recovery key password"
-msgstr "古い復旧キーのパスワード"
+msgstr "古いリカバリキーのパスワード"
 
 #: templates/settings-admin.php:47
 msgid "New Recovery key password"
-msgstr "新しい復旧キーのパスワード"
+msgstr "新しいリカバリキーのパスワード"
 
 #: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr "新しい復旧キーのパスワードをもう一度入力"
+msgstr "新しいリカバリキーのパスワードをもう一度入力"
 
 #: templates/settings-admin.php:58
 msgid "Change Password"
@@ -187,7 +188,7 @@ msgstr "秘密鍵のパスワードを更新"
 
 #: templates/settings-personal.php:42
 msgid "Enable password recovery:"
-msgstr "パスワード復旧を有効化:"
+msgstr "パスワードリカバリを有効に:"
 
 #: templates/settings-personal.php:44
 msgid ""
@@ -197,8 +198,8 @@ msgstr "このオプションを有効にすると、パスワードを紛失し
 
 #: templates/settings-personal.php:60
 msgid "File recovery settings updated"
-msgstr "ファイル復旧設定が更新されました"
+msgstr "ファイルリカバリ設定を更新しました"
 
 #: templates/settings-personal.php:61
 msgid "Could not update file recovery"
-msgstr "ファイル復旧を更新できませんでした"
+msgstr "ファイルリカバリを更新できませんでした"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja/files_external.po
similarity index 59%
rename from l10n/ja_JP/files_external.po
rename to l10n/ja/files_external.po
index ffff86e20f..d7b59ad313 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja/files_external.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# plazmism <gomidori@live.jp>, 2014
+# kuromabo <md81bird@hitaki.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
+"PO-Revision-Date: 2014-03-11 13:31+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,45 +19,49 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "アクセスは許可されました"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Dropboxストレージの設定エラー"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "アクセスを許可"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr "有効なDropboxアプリのキーとパスワードを入力して下さい。"
+msgstr "有効なDropboxアプリのキーとパスワードを入力してください。"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Googleドライブストレージの設定エラー"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "保存されました"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr "<b>警告:</b> \"smbclient\" はインストールされていません。CIFS/SMB 共有のマウントはできません。システム管理者にインストールをお願いして下さい。"
+msgstr "<b>警告:</b> \"smbclient\" がインストールされていません。CIFS/SMB共有のマウントはできません。システム管理者にインストールを依頼してください。"
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr "<b>警告:</b> PHPのFTPサポートは無効もしくはインストールされていません。FTP共有のマウントはできません。システム管理者にインストールをお願いして下さい。"
+msgstr "<b>警告:</b> PHPのFTPサポートが無効またはインストールされていません。FTP共有のマウントはできません。システム管理者にインストールを依頼してください。"
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
 "your system administrator to install it."
-msgstr "<b>警告:</b> PHP の Curl サポートは無効もしくはインストールされていません。ownCloud / WebDAV もしくは GoogleDrive のマウントはできません。システム管理者にインストールをお願いして下さい。"
+msgstr "<b>警告:</b> PHPのCurlサポートが無効またはインストールされていません。ownCloud / WebDAVまたはGoogleDriveのマウントはできません。システム管理者にインストールを依頼してください。"
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -63,7 +69,7 @@ msgstr "外部ストレージ"
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr "フォルダ名"
+msgstr "フォルダー名"
 
 #: templates/settings.php:10
 msgid "External storage"
@@ -91,7 +97,7 @@ msgstr "未設定"
 
 #: templates/settings.php:91
 msgid "All Users"
-msgstr "すべてのユーザ"
+msgstr "すべてのユーザー"
 
 #: templates/settings.php:92
 msgid "Groups"
@@ -99,25 +105,25 @@ msgstr "グループ"
 
 #: templates/settings.php:100
 msgid "Users"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "削除"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
-msgstr "ユーザの外部ストレージを有効にする"
+msgstr "ユーザーの外部ストレージを有効にする"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "ユーザに外部ストレージのマウントを許可する"
+msgid "Allow users to mount the following external storage"
+msgstr "ユーザに以下の外部ストレージのマウントを許可する"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSLルート証明書"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "ルート証明書をインポート"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja/files_sharing.po
similarity index 69%
rename from l10n/ja_JP/files_sharing.po
rename to l10n/ja/files_sharing.po
index 248c946c07..a261938104 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja/files_sharing.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
+# plazmism <gomidori@live.jp>, 2014
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
+"PO-Revision-Date: 2014-03-11 13:31+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +20,10 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "{owner} と共有中"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "この共有はパスワードで保護されています"
@@ -55,32 +60,16 @@ msgstr "共有が無効になっています"
 msgid "For more info, please ask the person who sent this link."
 msgstr "不明な点は、こちらのリンクの提供者に確認をお願いします。"
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s はフォルダー %s をあなたと共有中です"
+msgid "shared by %s"
+msgstr "%s で共有中"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s はファイル %s をあなたと共有中です"
+msgid "Download %s"
+msgstr "%s をダウンロード"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "ダウンロード"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "アップロード"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "アップロードをキャンセル"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "プレビューはありません"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "リンク"
diff --git a/l10n/ja_JP/files_trashbin.po b/l10n/ja/files_trashbin.po
similarity index 62%
rename from l10n/ja_JP/files_trashbin.po
rename to l10n/ja/files_trashbin.po
index 634208ae93..54d718dcc9 100644
--- a/l10n/ja_JP/files_trashbin.po
+++ b/l10n/ja/files_trashbin.po
@@ -5,14 +5,15 @@
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
 # plazmism <gomidori@live.jp>, 2013
+# kuromabo <md81bird@hitaki.net>, 2014
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\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"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,44 +21,48 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "%s を完全に削除出来ませんでした"
+msgstr "%s を完全に削除できませんでした"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
-msgstr "%s を復元出来ませんでした"
+msgstr "%s を復元できませんでした"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "ゴミ箱"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "エラー"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "復元済"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "ここには何もありません。ゴミ箱は空です！"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "名前"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "復元"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "削除済み"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "削除"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "ゴミ箱"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja/files_versions.po
similarity index 84%
rename from l10n/ja_JP/files_versions.po
rename to l10n/ja/files_versions.po
index a160c897a2..9de686c4ff 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja/files_versions.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
 "PO-Revision-Date: 2013-08-04 01:10+0000\n"
 "Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
@@ -23,22 +23,22 @@ msgstr ""
 msgid "Could not revert: %s"
 msgstr "元に戻せませんでした: %s"
 
-#: js/versions.js:7
+#: js/versions.js:14
 msgid "Versions"
 msgstr "バージョン"
 
-#: js/versions.js:53
+#: js/versions.js:60
 msgid "Failed to revert {file} to revision {timestamp}."
 msgstr "{file} を {timestamp} のリヴィジョンに戻すことができません。"
 
-#: js/versions.js:79
+#: js/versions.js:87
 msgid "More versions..."
 msgstr "もっと他のバージョン..."
 
-#: js/versions.js:116
+#: js/versions.js:125
 msgid "No other versions available"
 msgstr "利用可能な他のバージョンはありません"
 
-#: js/versions.js:149
+#: js/versions.js:155
 msgid "Restore"
 msgstr "復元"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja/lib.po
similarity index 69%
rename from l10n/ja_JP/lib.po
rename to l10n/ja/lib.po
index addc53d2f7..07ec088145 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja/lib.po
@@ -4,16 +4,17 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
-# plazmism <gomidori@live.jp>, 2013
+# plazmism <gomidori@live.jp>, 2013-2014
 # Koichi MATSUMOTO <mzch@me.com>, 2013
+# kuromabo <md81bird@hitaki.net>, 2014
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-25 01:55-0500\n"
-"PO-Revision-Date: 2013-12-24 08:00+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
+"PO-Revision-Date: 2014-03-11 13:31+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,34 +22,34 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:245
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr " \"%s\" アプリは、このバージョンのownCloudと互換性がない為、インストールできません。"
+msgstr " \"%s\" アプリは、このバージョンのownCloudと互換性がないためインストールできません。"
 
-#: private/app.php:257
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "アプリ名が未指定"
 
-#: private/app.php:362
+#: private/app.php:353
 msgid "Help"
 msgstr "ヘルプ"
 
-#: private/app.php:375
+#: private/app.php:366
 msgid "Personal"
 msgstr "個人"
 
-#: private/app.php:386
+#: private/app.php:377
 msgid "Settings"
 msgstr "設定"
 
-#: private/app.php:398
+#: private/app.php:389
 msgid "Users"
-msgstr "ユーザ"
+msgstr "ユーザー"
 
-#: private/app.php:411
+#: private/app.php:402
 msgid "Admin"
 msgstr "管理"
 
@@ -65,15 +66,10 @@ msgstr "不明なファイルタイプ"
 msgid "Invalid image"
 msgstr "無効な画像"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "管理下のウェブサービス"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "\"%s\" が開けません"
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIPダウンロードは無効です。"
@@ -96,74 +92,78 @@ msgid ""
 "administrator."
 msgstr "少しずつに分けてファイルをダウンロードするか、管理者に問い合わせてください。"
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "アプリインストール時のソースが未指定"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "アプリインストール時のhttpの URL が未指定"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "アプリインストール時のローカルファイルのパスが未指定"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "\"%s\"タイプのアーカイブ形式は未サポート"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "アプリをインストール中にアーカイブファイルを開けませんでした。"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "アプリにinfo.xmlファイルが入っていません"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "アプリで許可されないコードが入っているのが原因でアプリがインストールできません"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr "アプリは、このバージョンのownCloudと互換性がない為、インストールできません。"
+msgstr "アプリは、このバージョンのownCloudと互換性がないためインストールできません。"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストール出来ません。"
+msgstr "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
-msgstr "info.xml/versionのバージョンがアプリストアのバージョンと合っていない為、アプリはインストールされません"
+msgstr "info.xml/versionのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
-msgstr "アプリディレクトリは既に存在します"
+msgstr "アプリディレクトリはすでに存在します"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr "アプリフォルダを作成出来ませんでした。%s のパーミッションを修正してください。"
+msgstr "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "アプリケーションは無効です"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "認証エラー"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "トークンが無効になりました。ページを再読込してください。"
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "不明なユーザー"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "ファイル"
@@ -179,7 +179,7 @@ msgstr "画像"
 #: private/setup/abstractdatabase.php:26
 #, php-format
 msgid "%s enter the database username."
-msgstr "%s のデータベースのユーザ名を入力してください。"
+msgstr "%s のデータベースのユーザー名を入力してください。"
 
 #: private/setup/abstractdatabase.php:29
 #, php-format
@@ -197,23 +197,23 @@ 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 "既存のアカウントもしくは管理者のどちらかを入力する必要があります。"
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQLのユーザ名もしくはパスワードは有効ではありません"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "MySQL/MariaDB のユーザー名及び/またはパスワードが無効"
 
 #: 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 "DBエラー: \"%s\""
@@ -222,30 +222,30 @@ msgstr "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 "違反コマンド: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQLのユーザ '%s'@'localhost' はすでに存在します。"
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "MySQL/MariaDB のユーザー '%s'@'localhost' はすでに存在します。"
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "MySQLからこのユーザを削除"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "MySQL/MariaDB からこのユーザーを削除"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQLのユーザ '%s'@'%%' はすでに存在します。"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "MySQL/MariaDB のユーザー '%s'@'%%' はすでに存在します"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "MySQLからこのユーザを削除する。"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "MySQL/MariaDB からこのユーザーを削除。"
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -253,81 +253,87 @@ msgstr "Oracleへの接続が確立できませんでした。"
 
 #: private/setup/oci.php:41 private/setup/oci.php:113
 msgid "Oracle username and/or password not valid"
-msgstr "Oracleのユーザ名もしくはパスワードは有効ではありません"
+msgstr "Oracleのユーザー名もしくはパスワードは有効ではありません"
 
 #: private/setup/oci.php:170 private/setup/oci.php:202
 #, php-format
 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のユーザ名もしくはパスワードは有効ではありません"
+msgstr "PostgreSQLのユーザー名もしくはパスワードは有効ではありません"
 
 #: private/setup.php:28
 msgid "Set an admin username."
-msgstr "管理者のユーザ名を設定。"
+msgstr "管理者のユーザー名を設定"
 
 #: private/setup.php:31
 msgid "Set an admin password."
 msgstr "管理者のパスワードを設定。"
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
-msgstr "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。"
+msgstr "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。"
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>インストールガイド</a>をよく確認してください。"
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%sが あなたと »%s«を共有しました"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "カテゴリ \"%s\" が見つかりませんでした"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "数秒前"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分前"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 時間前"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "今日"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
-msgstr "昨日"
-
-#: private/template/functions.php:136
-msgid "%n day go"
-msgid_plural "%n days ago"
-msgstr[0] "%n 日前"
-
-#: private/template/functions.php:138
-msgid "last month"
-msgstr "一月前"
+msgstr "1日前"
 
 #: private/template/functions.php:139
-msgid "%n month ago"
-msgid_plural "%n months ago"
-msgstr[0] "%n ヶ月前"
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "%n日前"
 
 #: private/template/functions.php:141
-msgid "last year"
-msgstr "一年前"
+msgid "last month"
+msgstr "1ヶ月前"
 
 #: private/template/functions.php:142
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%nヶ月前"
+
+#: private/template/functions.php:144
+msgid "last year"
+msgstr "1年前"
+
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "年前"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja/settings.po
similarity index 59%
rename from l10n/ja_JP/settings.po
rename to l10n/ja/settings.po
index a5ec0d605f..85b9f370db 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja/settings.po
@@ -3,17 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
-# plazmism <gomidori@live.jp>, 2013
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013-2014
+# plazmism <gomidori@live.jp>, 2013-2014
 # iLikeIT <dj_dark_junglist@yahoo.com>, 2013
+# kuromabo <md81bird@hitaki.net>, 2014
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-11 13:31-0500\n"
-"PO-Revision-Date: 2013-12-11 02:00+0000\n"
-"Last-Translator: iLikeIT <dj_dark_junglist@yahoo.com>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +22,48 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "%s に提供された無効な値"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "保存されました"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "eメール設定をテスト"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "このメールを受け取ったら、設定は正しいはずです。"
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "メールの送信中に問題が発生しました。設定を再考してください。"
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "メールを送信しました"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。"
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "送信モード"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "暗号化"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "認証方法"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "アプリストアからリストをロードできません"
@@ -32,15 +75,15 @@ msgstr "認証エラー"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
-msgstr "姓名が変更されました"
+msgstr "フルネームを変更しました。"
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change full name"
-msgstr "姓名を変更できません"
+msgstr "フルネームを変更できません"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr "グループは既に存在しています"
+msgstr "グループはすでに存在します"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
@@ -60,7 +103,7 @@ msgstr "グループを削除できません"
 
 #: ajax/removeuser.php:25
 msgid "Unable to delete user"
-msgstr "ユーザを削除できません"
+msgstr "ユーザーを削除できません"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
@@ -77,16 +120,16 @@ msgstr "管理者は自身を管理者グループから削除できません。
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr "ユーザをグループ %s に追加できません"
+msgstr "ユーザーをグループ %s に追加できません"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr "ユーザをグループ %s から削除できません"
+msgstr "ユーザーをグループ %s から削除できません"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr "アプリを更新出来ませんでした。"
+msgstr "アプリをアップデートできませんでした。"
 
 #: changepassword/controller.php:20
 msgid "Wrong password"
@@ -94,85 +137,113 @@ msgstr "無効なパスワード"
 
 #: changepassword/controller.php:42
 msgid "No user supplied"
-msgstr "ユーザが指定されていません"
+msgstr "ユーザーが指定されていません"
 
 #: changepassword/controller.php:74
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr "復元用の管理者パスワードを入力してください。そうでない場合は、全ユーザのデータが失われます。"
+msgstr "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。"
 
 #: changepassword/controller.php:79
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
-msgstr "無効な復元用の管理者パスワード。パスワードを確認して再度実行してください。"
+msgstr "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。"
 
 #: changepassword/controller.php:87
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
-msgstr "バックエンドはパスワード変更をサポートしていませんが、ユーザの暗号化キーは正常に更新されました。"
+msgstr "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。"
 
 #: changepassword/controller.php:92 changepassword/controller.php:103
 msgid "Unable to change password"
 msgstr "パスワードを変更できません"
 
-#: js/apps.js:43
-msgid "Update to {appversion}"
-msgstr "{appversion} に更新"
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "送信中…"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "ユーザードキュメント"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "管理者ドキュメント"
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr "{appversion} にアップデート"
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "無効"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
-msgstr "有効化"
+msgstr "有効にする"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "しばらくお待ちください。"
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "アプリ無効化中にエラーが発生"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
-msgstr "アプリ有効化中にエラーが発生"
+msgstr "アプリを有効にする際にエラーが発生"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "更新中...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "アプリの更新中にエラーが発生"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "エラー"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
-msgstr "更新"
+msgstr "アップデート"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
-msgstr "更新済み"
+msgstr "アップデート済み"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "プロファイル画像を選択"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "非常に弱いパスワード"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "弱いパスワード"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "まずまずのパスワード"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "良好なパスワード"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "強いパスワード"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。"
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "保存中..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "削除"
@@ -183,42 +254,42 @@ msgstr "元に戻す"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr "ユーザを削除出来ません"
+msgstr "ユーザーを削除できません"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "グループ"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "グループ管理者"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "削除"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "グループを追加"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
-msgstr "有効なユーザ名を指定する必要があります"
+msgstr "有効なユーザー名を指定する必要があります"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
-msgstr "ユーザ作成エラー"
+msgstr "ユーザー作成エラー"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "有効なパスワードを指定する必要があります"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
-msgstr "警告: ユーザ \"{user}\" のホームディレクトリはすでに存在します"
+msgstr "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Japanese (日本語)"
 
@@ -228,32 +299,56 @@ msgstr "すべて (致命的な問題、エラー、警告、情報、デバッ
 
 #: templates/admin.php:9
 msgid "Info, warnings, errors and fatal issues"
-msgstr "情報と警告、エラー、致命的な問題"
+msgstr "情報、警告、エラー、致命的な問題"
 
 #: templates/admin.php:10
 msgid "Warnings, errors and fatal issues"
-msgstr "警告とエラー、致命的な問題"
+msgstr "警告、エラー、致命的な問題"
 
 #: templates/admin.php:11
 msgid "Errors and fatal issues"
-msgstr "エラーと致命的な問題"
+msgstr "エラー、致命的な問題"
 
 #: templates/admin.php:12
 msgid "Fatal issues only"
 msgstr "致命的な問題のみ"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "なし"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "ログイン"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "平文"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "NT LAN マネージャー"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "セキュリティ警告"
 
-#: templates/admin.php:25
+#: 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 "HTTP 経由で %s にアクセスしています。HTTPS を使用するようにサーバの設定を行うことを強くおすすめします。"
+msgstr "HTTP経由で %s にアクセスしています。HTTPSを使用するようサーバーを設定することを強くおすすめします。"
 
-#: templates/admin.php:39
+#: 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 "
@@ -262,68 +357,68 @@ msgid ""
 "root."
 msgstr "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにウェブサーバーを設定するか、ウェブサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。"
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "セットアップ警告"
 
-#: templates/admin.php:53
+#: 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インタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。"
+msgstr "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。"
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "<a href=\"%s\">installation guides</a>をもう一度チェックするようにお願いいたします。"
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "モジュール 'fileinfo' が見つかりません"
 
-#: templates/admin.php:68
+#: 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 "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。"
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
-msgstr "PHPバーションが古くなっております。"
+msgstr "PHPバーションが古くなっています。"
 
-#: templates/admin.php:82
+#: 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バーションが古くなっております。このプログラムが不正な行為を発生する可能性はある為、PHPバーション5.3.8以降にアップグレードをください。"
+msgstr "PHPバーションが古くなっています。古いバージョンには既知の問題があるため、5.3.8以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。"
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "ロケールが動作していません"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "システムロケールを UTF-8 をサポートするロケールに設定できません。"
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "これは、ファイル名の特定の文字に問題があることを意味しています。"
 
-#: templates/admin.php:106
+#: 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:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "インターネット接続が動作していません"
 
-#: templates/admin.php:121
+#: 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 "
@@ -332,118 +427,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。"
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "各ページの読み込み時にタスクを実行する"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
-msgstr "HTTPを通して15分間隔で cron.php を実行するように、cron.php は webcron サービスに登録されています。"
+msgstr "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています"
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr "15分間隔で cron.php ファイルを実行するためにシステムの cron サービスを利用する"
+msgstr "システムのcronサービスを利用して15分ごとにcron.phpファイルを実行します。"
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "共有"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "共有APIを有効にする"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "アプリからの共有APIの利用を許可する"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "リンクを許可する"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
-msgstr "リンクによりアイテムを公開することを許可する"
+msgstr "ユーザーがリンクによりアイテムを公開することを許可する"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "パブリックなアップロードを許可"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
-msgstr "公開している共有フォルダへのアップロードを共有しているメンバーにも許可"
+msgstr "公開している共有フォルダーへのアップロードを共有しているメンバーにも許可"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "再共有を許可する"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
-msgstr "ユーザが共有しているアイテムの再共有を許可する"
+msgstr "ユーザーが共有しているアイテムの再共有を許可する"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
-msgstr "ユーザが誰とでも共有することを許可する"
+msgstr "ユーザーに誰とでも共有することを許可する"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
-msgstr "ユーザにグループ内のユーザとのみ共有を許可する"
+msgstr "ユーザーにグループ内のユーザーとのみ共有を許可する"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "メール通知を許可"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
-msgstr "共有ファイルに関するメール通知の送信をユーザに許可する"
+msgstr "共有ファイルに関するメール通知の送信をユーザーに許可する"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "セキュリティ"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "常にHTTPSを使用する"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr "クライアントから %sへの接続を常に暗号化する。"
+msgstr "クライアントから %sへの接続を常に暗号化します。"
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
-msgstr "強制的なSSL接続を有効／無効にするために、HTTPS経由で %s へ接続してください。"
+msgstr "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。"
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "メールサーバー"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "これは通知の送信に使われます。"
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "アドレスから"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "要求される認証"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "サーバーアドレス"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "ポート"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "資格情報"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "SMTP ユーザー名"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "SMTP パスワード"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "メールテスト設定"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "メールを送信"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "ログレベル"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "もっと見る"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "閉じる"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "バージョン"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -453,30 +608,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。"
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "アプリを追加"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "さらにアプリを表示"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "アプリを選択してください"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "ドキュメント:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com でアプリケーションのページを見てください"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "アプリケーションのウェブサイトを見る"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "ユーザドキュメント"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "管理者ドキュメント"
@@ -495,7 +654,7 @@ msgstr "バグトラッカー"
 
 #: templates/help.php:17
 msgid "Commercial Support"
-msgstr "コマーシャルサポート"
+msgstr "商用サポート"
 
 #: templates/personal.php:8
 msgid "Get the apps to sync your files"
@@ -510,7 +669,7 @@ msgstr "初回ウィザードを再表示する"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "パスワード"
 
@@ -522,151 +681,149 @@ msgstr "パスワードを変更しました"
 msgid "Unable to change your password"
 msgstr "パスワードを変更することができません"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Current password"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "新しいパスワードを入力"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "パスワードを変更"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
-msgstr "姓名"
+msgstr "名前"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "メール"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "あなたのメールアドレス"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "※パスワード回復を有効にするにはメールアドレスの入力が必要です"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "プロフィール写真"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "新規にアップロード"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "ファイルから新規に選択"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "画像を削除"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。"
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。"
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "中止"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "キャンセル"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "プロファイル画像として選択"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "言語"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "翻訳に協力する"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "<a href=\"%s\" target=\"_blank\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "暗号化"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "ログインパスワード"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "すべてのファイルを複合する"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "ログイン名"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "作成"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
-msgstr "管理者復旧パスワード"
+msgstr "管理者リカバリパスワード"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr "パスワード変更の間のユーザーのファイルを回復するために、リカバリパスワードを入力してください"
+msgstr "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "デフォルトストレージ"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "無制限"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "その他"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "ユーザー名"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "ストレージ"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
-msgstr "姓名を変更"
+msgstr "フルネームを変更"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "新しいパスワードを設定"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "デフォルト"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja/user_ldap.po
similarity index 70%
rename from l10n/ja_JP/user_ldap.po
rename to l10n/ja/user_ldap.po
index 1061b8d35c..e670589dd7 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja/user_ldap.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013
-# plazmism <gomidori@live.jp>, 2013
+# plazmism <gomidori@live.jp>, 2013-2014
+# kuromabo <md81bird@hitaki.net>, 2014
 # tt yn <tetuyano+transi@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: plazmism <gomidori@live.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr "マッピングのクリアに失敗しました。"
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr "サーバ設定の削除に失敗しました"
+msgstr "サーバー設定の削除に失敗しました"
 
 #: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
@@ -36,7 +37,7 @@ msgstr "設定は有効であり、接続を確立しました！"
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
-msgstr "設定は有効ですが、接続に失敗しました。サーバ設定と資格情報を確認して下さい。"
+msgstr "設定は有効ですが、接続に失敗しました。サーバー設定と資格情報を確認してください。"
 
 #: ajax/testConfiguration.php:46
 msgid ""
@@ -67,7 +68,7 @@ msgstr "削除に失敗しました"
 
 #: js/settings.js:83
 msgid "Take over settings from recent server configuration?"
-msgstr "最近のサーバ設定から設定を引き継ぎますか？"
+msgstr "最近のサーバー設定から設定を引き継ぎますか？"
 
 #: js/settings.js:84
 msgid "Keep settings?"
@@ -75,7 +76,7 @@ msgstr "設定を保持しますか？"
 
 #: js/settings.js:99
 msgid "Cannot add server configuration"
-msgstr "サーバ設定を追加できません"
+msgstr "サーバー設定を追加できません"
 
 #: js/settings.js:127
 msgid "mappings cleared"
@@ -89,43 +90,43 @@ msgstr "成功"
 msgid "Error"
 msgstr "エラー"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "設定OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "設定に誤りがあります"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "設定が不完全です"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "グループを選択"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "オブジェクトクラスを選択"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "属性を選択"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "接続テストに成功しました"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "接続テストに失敗しました"
 
-#: js/settings.js:921
-msgid "Do you really want to delete the current Server Configuration?"
-msgstr "現在のサーバ設定を本当に削除してもよろしいですか？"
-
 #: js/settings.js:922
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr "現在のサーバー設定を本当に削除してもよろしいですか？"
+
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "削除の確認"
 
@@ -139,13 +140,13 @@ msgstr[0] "%s グループが見つかりました"
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
-msgstr[0] "%s ユーザが見つかりました"
+msgstr[0] "%s ユーザーが見つかりました"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "無効なホスト"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "望ましい機能は見つかりませんでした"
 
@@ -163,8 +164,8 @@ msgstr "ヘルプ"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "この基準に合致するグループに %s へのアクセスを制限:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "これらの基準を満たすグループが %s で利用可能:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -199,12 +200,12 @@ msgid "groups found"
 msgstr "グループが見つかりました"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "ログイン名として利用する属性:"
+msgid "Users login with this attribute:"
+msgstr "この属性でユーザーログイン:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
-msgstr "LDAP ユーザ名:"
+msgstr "LDAP ユーザー名:"
 
 #: templates/part.wizard-loginfilter.php:16
 msgid "LDAP Email Address:"
@@ -219,11 +220,11 @@ msgstr "他の属性:"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザ名が入ります。例： \"uid=%%uid\""
+msgstr "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\""
 
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
-msgstr "サーバ設定を追加"
+msgstr "サーバー設定を追加"
 
 #: templates/part.wizard-server.php:30
 msgid "Host"
@@ -240,7 +241,7 @@ msgstr "ポート"
 
 #: templates/part.wizard-server.php:44
 msgid "User DN"
-msgstr "ユーザDN"
+msgstr "ユーザーDN"
 
 #: templates/part.wizard-server.php:45
 msgid ""
@@ -263,22 +264,22 @@ msgstr "1行に1つのベースDN"
 
 #: templates/part.wizard-server.php:61
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
+msgstr "拡張タブでユーザーとグループのベースDNを指定することができます。"
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "この基準に合致するユーザに %s へのアクセスを制限:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "この基準を満たすユーザに対し %s へのアクセスを制限:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
 msgid ""
 "The filter specifies which LDAP users shall have access to the %s instance."
-msgstr "フィルタは、どの LDAP ユーザが %s にアクセスするかを指定します。"
+msgstr "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。"
 
 #: templates/part.wizard-userfilter.php:38
 msgid "users found"
-msgstr "ユーザが見つかりました"
+msgstr "ユーザーが見つかりました"
 
 #: templates/part.wizardcontrols.php:5
 msgid "Back"
@@ -321,7 +322,7 @@ msgstr "バックアップ（レプリカ）ホスト"
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバのレプリカである必要があります。"
+msgstr "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバーのレプリカである必要があります。"
 
 #: templates/settings.php:24
 msgid "Backup (Replica) Port"
@@ -329,7 +330,7 @@ msgstr "バックアップ（レプリカ）ポート"
 
 #: templates/settings.php:25
 msgid "Disable Main Server"
-msgstr "メインサーバを無効にする"
+msgstr "メインサーバーを無効にする"
 
 #: templates/settings.php:25
 msgid "Only connect to the replica server."
@@ -337,7 +338,7 @@ msgstr "レプリカサーバーにのみ接続します。"
 
 #: templates/settings.php:26
 msgid "Case insensitve LDAP server (Windows)"
-msgstr "大文字／小文字を区別しないLDAPサーバ（Windows）"
+msgstr "大文字／小文字を区別しないLDAPサーバー（Windows）"
 
 #: templates/settings.php:27
 msgid "Turn off SSL certificate validation."
@@ -348,7 +349,7 @@ msgstr "SSL証明書の確認を無効にする。"
 msgid ""
 "Not recommended, use it for testing only! If connection only works with this"
 " option, import the LDAP server's SSL certificate in your %s server."
-msgstr "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバのSSL証明書を %s サーバにインポートしてください。"
+msgstr "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。"
 
 #: templates/settings.php:28
 msgid "Cache Time-To-Live"
@@ -364,23 +365,23 @@ msgstr "ディレクトリ設定"
 
 #: templates/settings.php:32
 msgid "User Display Name Field"
-msgstr "ユーザ表示名のフィールド"
+msgstr "ユーザー表示名のフィールド"
 
 #: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the user's display name."
-msgstr "ユーザの表示名の生成に利用するLDAP属性"
+msgstr "ユーザーの表示名の生成に利用するLDAP属性"
 
 #: templates/settings.php:33
 msgid "Base User Tree"
-msgstr "ベースユーザツリー"
+msgstr "ベースユーザーツリー"
 
 #: templates/settings.php:33
 msgid "One User Base DN per line"
-msgstr "1行に1つのユーザベースDN"
+msgstr "1行に1つのユーザーベースDN"
 
 #: templates/settings.php:34
 msgid "User Search Attributes"
-msgstr "ユーザ検索属性"
+msgstr "ユーザー検索属性"
 
 #: templates/settings.php:34 templates/settings.php:37
 msgid "Optional; one attribute per line"
@@ -410,41 +411,51 @@ msgstr "グループ検索属性"
 msgid "Group-Member association"
 msgstr "グループとメンバーの関連付け"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "ネスト化ブロック"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "オンに切り替えたら、グループを含むグループがサポートされます。(グループメンバーの属性がDNを含む場合のみ有効です。)"
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "クォータフィールド"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "クォータのデフォルト"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "バイト"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "メールフィールド"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
-msgstr "ユーザのホームフォルダ命名規則"
+msgstr "ユーザーのホームフォルダー命名規則"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。"
-
-#: templates/settings.php:51
-msgid "Internal Username"
-msgstr "内部ユーザ名"
+msgstr "ユーザー名を空のままにしてください（デフォルト）。もしくは、LDAPもしくはADの属性を指定してください。"
 
 #: templates/settings.php:52
+msgid "Internal Username"
+msgstr "内部ユーザー名"
+
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -458,17 +469,17 @@ msgid ""
 "behavior as before ownCloud 5 enter the user display name attribute in the "
 "following field. Leave it empty for default behavior. Changes will have "
 "effect only on newly mapped (added) LDAP users."
-msgstr "デフォルトでは、内部ユーザ名はUUID属性から作成されます。これにより、ユーザ名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザ名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザ名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダ名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザ表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザにおいてのみ有効となります。"
-
-#: templates/settings.php:53
-msgid "Internal Username Attribute:"
-msgstr "内部ユーザ名属性:"
+msgstr "デフォルトでは、内部ユーザー名はUUID属性から作成されます。これにより、ユーザー名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザー名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザー名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダー名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザー表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザーにおいてのみ有効となります。"
 
 #: templates/settings.php:54
+msgid "Internal Username Attribute:"
+msgstr "内部ユーザー名属性:"
+
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "UUID検出を再定義する"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -477,21 +488,21 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザ名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザとLDAPグループに対してのみ有効となります。"
-
-#: templates/settings.php:56
-msgid "UUID Attribute for Users:"
-msgstr "ユーザの UUID 属性:"
+msgstr "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザーとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザー名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザーとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザーとLDAPグループに対してのみ有効となります。"
 
 #: templates/settings.php:57
+msgid "UUID Attribute for Users:"
+msgstr "ユーザーの UUID 属性:"
+
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "グループの UUID 属性:"
 
-#: templates/settings.php:58
-msgid "Username-LDAP User Mapping"
-msgstr "ユーザ名とLDAPユーザのマッピング"
-
 #: templates/settings.php:59
+msgid "Username-LDAP User Mapping"
+msgstr "ユーザー名とLDAPユーザのマッピング"
+
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -503,12 +514,12 @@ msgid ""
 " is not configuration sensitive, it affects all LDAP configurations! Never "
 "clear the mappings in a production environment, only in a testing or "
 "experimental stage."
-msgstr "ユーザ名は（メタ）データの保存と割り当てに使用されます。ユーザを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザ名からLDAPユーザへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。"
+msgstr "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
-msgstr "ユーザ名とLDAPユーザのマッピングをクリアする"
+msgstr "ユーザー名とLDAPユーザーのマッピングをクリアする"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "グループ名とLDAPグループのマッピングをクリアする"
diff --git a/l10n/ja_JP/user_webdavauth.po b/l10n/ja/user_webdavauth.po
similarity index 93%
rename from l10n/ja_JP/user_webdavauth.po
rename to l10n/ja/user_webdavauth.po
index c24eb2a95d..6dad27018b 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja/user_webdavauth.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-04 01:55-0400\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
 "PO-Revision-Date: 2013-08-04 01:10+0000\n"
 "Last-Translator: tt yn <tetuyano+transi@gmail.com>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 624e0a15d5..2f9ec267e3 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,131 +58,135 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "კვირა"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "ორშაბათი"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "სამშაბათი"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "ოთხშაბათი"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "ხუთშაბათი"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "პარასკევი"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "შაბათი"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "იანვარი"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "თებერვალი"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "მარტი"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "აპრილი"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "მაისი"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "ივნისი"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "ივლისი"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "აგვისტო"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "სექტემბერი"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "ოქტომბერი"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "ნოემბერი"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "დეკემბერი"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "შენახვა..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "თვის წინ"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "წლის წინ"
 
@@ -263,6 +253,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "გაზიარებული"
@@ -271,12 +281,12 @@ msgstr "გაზიარებული"
 msgid "Share"
 msgstr "გაზიარება"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "შეცდომა გაზიარების დროს"
 
@@ -288,123 +298,123 @@ msgstr "შეცდომა გაზიარების გაუქმე
 msgid "Error while changing permissions"
 msgstr "შეცდომა დაშვების ცვლილების დროს"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "გაზიარდა თქვენთვის {owner}–ის მიერ"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "პაროლით დაცვა"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "პაროლი"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "ლინკის პიროვნების იმეილზე გაგზავნა"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "გაგზავნა"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "მიუთითე ვადის გასვლის დრო"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "ვადის გასვლის დრო"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "გააზიარე მეილზე"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "მომხმარებელი არ არის ნაპოვნი"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "ჯგუფი"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "მეორეჯერ გაზიარება არ არის დაშვებული"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "გაზიარდა {item}–ში  {user}–ის მიერ"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "გაუზიარებადი"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "შეგიძლია შეცვლა"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "დაშვების კონტროლი"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "შექმნა"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "განახლება"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "წაშლა"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "გაზიარება"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "პაროლით დაცული"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "შეცდომა ვადის გასვლის მითითების დროს"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "გაგზავნა ...."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "იმეილი გაიგზავნა"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "გაფრთხილება"
 
@@ -451,11 +461,17 @@ msgstr "განახლება ვერ განხორციელდ
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}"
@@ -475,8 +491,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "მომხმარებლის სახელი"
 
@@ -512,6 +528,18 @@ msgstr "ახალი პაროლი"
 msgid "Reset password"
 msgstr "პაროლის შეცვლა"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "პირადი"
@@ -520,7 +548,7 @@ msgstr "პირადი"
 msgid "Users"
 msgstr "მომხმარებელი"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "აპლიკაციები"
 
@@ -630,49 +658,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "შექმენი <strong>ადმინ ექაუნტი</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "დამატებითი ფუნქციები"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "მონაცემთა საქაღალდე"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "მონაცემთა ბაზის კონფიგურირება"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "გამოყენებული იქნება"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "მონაცემთა ბაზის მომხმარებელი"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "მონაცემთა ბაზის პაროლი"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "მონაცემთა ბაზის სახელი"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "ბაზის ცხრილის ზომა"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "მონაცემთა ბაზის ჰოსტი"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "კონფიგურაციის დასრულება"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +714,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "გამოსვლა"
 
@@ -714,27 +740,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "დაგავიწყდათ პაროლი?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "დამახსოვრება"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "შესვლა"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "ალტერნატიული Login–ი"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 519f12885e..227a54b6dd 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,280 +17,287 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "%s –ის გადატანა ვერ მოხერხდა – ფაილი ამ სახელით უკვე არსებობს"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "%s –ის გადატანა ვერ მოხერხდა"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "ფაილის სახელი არ შეიძლება იყოს ცარიელი."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და  '*' არ არის დაიშვებული."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "ფაილი არ აიტვირთა. უცნობი შეცდომა"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ატვირთული ფაილი აჭარბებს  MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "ფაილი არ აიტვირთა"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "დროებითი საქაღალდე არ არსებობს"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "შეცდომა დისკზე ჩაწერისას"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "საცავში საკმარისი ადგილი არ არის"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "დაუშვებელი დირექტორია."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "ფაილები"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "საკმარისი ადგილი არ არის"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "ატვირთვა შეჩერებულ იქნა."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} უკვე არსებობს"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "გაზიარება"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "სრულად წაშლა"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "გადარქმევა"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "მოცდის რეჟიმში"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} შეცვლილია {old_name}–ით"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "დაბრუნება"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' არის დაუშვებელი ფაილის სახელი."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და  '*' არ არის დაიშვებული."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "გადმოწერის მოთხოვნა მუშავდება. ის მოითხოვს გარკვეულ დროს რაგდან ფაილები არის დიდი ზომის."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "სახელი"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "ზომა"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "შეცვლილია"
 
@@ -298,12 +305,12 @@ msgstr "შეცვლილია"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "ატვირთვა"
 
@@ -339,72 +346,68 @@ msgstr "ZIP ფაილების მაქსიმუმ დასაშვ
 msgid "Save"
 msgstr "შენახვა"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "ახალი"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "ტექსტური ფაილი"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "ახალი ფოლდერი"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "საქაღალდე"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "მისამართიდან"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "წაშლილი ფაილები"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ატვირთვის გაუქმება"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "აქ არაფერი არ არის. ატვირთე რამე!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "ჩამოტვირთვა"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "წაშლა"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "ასატვირთი ფაილი ძალიან დიდია"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "მიმდინარე სკანირება"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "ფაილური სისტემის ქეშის განახლება...."
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index bdd6332a2a..caedd121e7 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "შენახვა..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index 655c7a0042..f4c239e65c 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: drlinux64 <romeo@energo-pro.ge>\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"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "დაშვება მინიჭებულია"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "შეცდომა Dropbox საცავის კონფიგურირების დროს"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "დაშვების მინიჭება"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "გთხოვთ მიუთითოთ Dropbox აპლიკაციის გასაღები და კოდი."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "შეცდომა Google Drive საცავის კონფიგურირების დროს"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>გაფრთხილება:</b> \"smbclient\" არ არის ინსტალირებული. CIFS/SMB ზიარების მონტირება შეუძლებელია. გთხოვთ თხოვოთ თქვენს სისტემურ ადმინისტრატორებს დააინსტალიროს ის."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>გაფრთხილება:</b>  FTP მხარდაჭერა არ არის აქტიური ან დაინსტალირებული. FTP ზიარის მონტირება შეუძლებელია. გთხოვთ თხოვოთ თქვენს სისტემურ ადმინისტრატორებს დააინსტალიროს ის."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "მომხმარებელი"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "წაშლა"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "მომხმარებლის ექსტერნალ საცავის აქტივირება"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "მიეცით მომხმარებლებს თავისი ექსტერნალ საცავის მონტირების  უფლება"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL root სერთიფიკატები"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Root სერთიფიკატის იმპორტირება"
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
index f27a19411d..a68d515711 100644
--- a/l10n/ka_GE/files_sharing.po
+++ b/l10n/ka_GE/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 06:20+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "გაზიარდა {owner} –ის მიერ"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s–მა გაგიზიარათ ფოლდერი %s"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s–მა გაგიზიარათ ფაილი %s"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "ჩამოტვირთვა"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "ატვირთვა"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "ატვირთვის გაუქმება"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "წინასწარი დათვალიერება შეუძლებელია"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ka_GE/files_trashbin.po b/l10n/ka_GE/files_trashbin.po
index 590410f057..1ffeff0c2b 100644
--- a/l10n/ka_GE/files_trashbin.po
+++ b/l10n/ka_GE/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "%s–ის აღდგენა ვერ მოხერხდა"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "წაშლილი ფაილები"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "შეცდომა"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "სახელი"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "აღდგენა"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "წაშლილი"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "წაშლა"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "წაშლილი ფაილები"
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 26ee4dc2e8..775fa57d28 100644
--- a/l10n/ka_GE/lib.po
+++ b/l10n/ka_GE/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "დახმარება"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "პირადი"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "მომხმარებელი"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "ადმინისტრატორი"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP download–ი გათიშულია"
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "აპლიკაცია არ არის აქტიური"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "ავთენტიფიკაციის შეცდომა"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token–ს ვადა გაუვიდა. გთხოვთ განაახლოთ გვერდი."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "ფაილები"
@@ -199,8 +198,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL იუზერნეიმი და/ან პაროლი არ არის სწორი"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -227,21 +226,21 @@ msgstr "Offending ბრძანება იყო: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL მომხმარებელი '%s'@'localhost' უკვე არსებობს."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "წაშალე ეს მომხამრებელი MySQL–იდან"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL მომხმარებელი '%s'@'%%' უკვე არსებობს"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "წაშალე ეს მომხამრებელი MySQL–იდან"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -268,62 +267,68 @@ msgstr "დააყენეთ ადმინისტრატორის 
 msgid "Set an admin password."
 msgstr "დააყენეთ ადმინისტრატორის პაროლი."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "დღეს"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "წლის წინ"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 6cdd5a52ef..797400953f 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "იმეილი გაიგზავნა"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "ენკრიპცია"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "აპლიკაციების სია ვერ ჩამოიტვირთა App Store"
@@ -114,61 +156,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "მომხმარებლის დოკუმენტაცია"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "განაახლე {appversion}–მდე"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "გამორთვა"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "ჩართვა"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "დაიცადეთ...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "მიმდინარეობს განახლება...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "შეცდომა აპლიკაციის განახლების დროს"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "განახლება"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "განახლებულია"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "შენახვა..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -182,40 +252,40 @@ msgstr "დაბრუნება"
 msgid "Unable to remove user"
 msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "ჯგუფები"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "ჯგუფის ადმინისტრატორი"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "წაშლა"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "ჯგუფის დამატება"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "უნდა მიუთითოთ არსებული მომხმარებლის სახელი"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "შეცდომა მომხმარებლის შექმნისას"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "უნდა მიუთითოთ არსებული პაროლი"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "არა"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "ლოგინი"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "უსაფრთხოების გაფრთხილება"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "გაფრთხილება დაყენებისას"
 
-#: templates/admin.php:53
+#: 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 "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "მოდული 'fileinfo'  არ არსებობს"
 
-#: templates/admin.php:68
+#: 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 "PHP მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "ლოკალიზაცია არ მუშაობს"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "ინტერნეტ კავშირი არ მუშაობს"
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron–ი"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "გაზიარება"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Share API–ის ჩართვა"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "დაუშვი აპლიკაციების უფლება  Share API –ზე"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "ლინკების დაშვება"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "გადაზიარების დაშვება"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის გაზიარებული"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "უსაფრთხოება"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "HTTPS–ის ჩართვა"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "სერვერის მისამართი"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "პორტი"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "იუზერ/პაროლი"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "ლოგი"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "ლოგირების დონე"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "უფრო მეტი"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "უფრო ნაკლები"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "ვერსია"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +604,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "წარმოებულია <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "დაამატე შენი აპლიკაცია"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "უფრო მეტი აპლიკაციები"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "აირჩიეთ აპლიკაცია"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "მომხმარებლის დოკუმენტაცია"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "ადმინისტრატორის დოკუმენტაცია"
@@ -507,7 +665,7 @@ msgstr "მაჩვენე თავიდან გაშვებული
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "პაროლი"
 
@@ -519,151 +677,149 @@ msgstr "თქვენი პაროლი შეიცვალა"
 msgid "Unable to change your password"
 msgstr "თქვენი პაროლი არ შეიცვალა"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "მიმდინარე პაროლი"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "ახალი პაროლი"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "პაროლის შეცვლა"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "იმეილი"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "თქვენი იმეილ მისამართი"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "უარყოფა"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "ენა"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "თარგმნის დახმარება"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "ენკრიპცია"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "მომხმარებლის სახელი"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "შექმნა"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "საწყისი საცავი"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "ულიმიტო"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "სხვა"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "მომხმარებლის სახელი"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "საცავი"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "დააყენეთ ახალი პაროლი"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "საწყისი პარამეტრები"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index e4540bd24e..ea64bec0b7 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "დასრულდა"
 msgid "Error"
 msgstr "შეცდომა"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "ჯგუფების არჩევა"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "კავშირის ტესტირება მოხერხდა"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "კავშირის ტესტირება ვერ მოხერხდა"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "წაშლის დადასტურება"
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr "დახმარება"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr "თქვენ შეგიძლიათ მიუთითოთ ს
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr "ჯგუფური ძებნის ატრიბუტი"
 msgid "Group-Member association"
 msgstr "ჯგუფის წევრობის ასოციაცია"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "სპეციალური ატრიბუტები"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "ქვოტას ველი"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "საწყისი ქვოტა"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "ბაიტებში"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "იმეილის ველი"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/km/core.po b/l10n/km/core.po
index bb74bdede4..740792ba4c 100644
--- a/l10n/km/core.po
+++ b/l10n/km/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# សុវិចិត្រ Sovichet ទេព Tep <sovichet.tep@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +18,11 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,30 +39,17 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
-msgstr ""
+msgstr "មិន​ស្គាល់​ប្រភេទ​ឯកសារ"
 
 #: avatar/controller.php:85
 msgid "Invalid image"
-msgstr ""
+msgstr "រូបភាព​មិន​ត្រឹម​ត្រូវ"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
@@ -72,137 +59,141 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
-msgid "Sunday"
-msgstr ""
-
-#: js/config.php:33
-msgid "Monday"
-msgstr ""
-
-#: js/config.php:34
-msgid "Tuesday"
-msgstr ""
-
-#: js/config.php:35
-msgid "Wednesday"
-msgstr ""
-
 #: js/config.php:36
-msgid "Thursday"
-msgstr ""
+msgid "Sunday"
+msgstr "ថ្ងៃអាទិត្យ"
 
 #: js/config.php:37
-msgid "Friday"
-msgstr ""
+msgid "Monday"
+msgstr "ថ្ងៃចន្ទ"
 
 #: js/config.php:38
+msgid "Tuesday"
+msgstr "ថ្ងៃអង្គារ"
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr "ថ្ងៃពុធ"
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr "ថ្ងៃព្រហស្បតិ៍"
+
+#: js/config.php:41
+msgid "Friday"
+msgstr "ថ្ងៃសុក្រ"
+
+#: js/config.php:42
 msgid "Saturday"
-msgstr ""
-
-#: js/config.php:43
-msgid "January"
-msgstr ""
-
-#: js/config.php:44
-msgid "February"
-msgstr ""
-
-#: js/config.php:45
-msgid "March"
-msgstr ""
-
-#: js/config.php:46
-msgid "April"
-msgstr ""
+msgstr "ថ្ងៃសៅរ៍"
 
 #: js/config.php:47
-msgid "May"
-msgstr ""
+msgid "January"
+msgstr "ខែមករា"
 
 #: js/config.php:48
-msgid "June"
-msgstr ""
+msgid "February"
+msgstr "ខែកុម្ភៈ"
 
 #: js/config.php:49
-msgid "July"
-msgstr ""
+msgid "March"
+msgstr "ខែមីនា"
 
 #: js/config.php:50
-msgid "August"
-msgstr ""
+msgid "April"
+msgstr "ខែមេសា"
 
 #: js/config.php:51
-msgid "September"
-msgstr ""
+msgid "May"
+msgstr "ខែឧសភា"
 
 #: js/config.php:52
-msgid "October"
-msgstr ""
+msgid "June"
+msgstr "ខែមិថុនា"
 
 #: js/config.php:53
-msgid "November"
-msgstr ""
+msgid "July"
+msgstr "ខែកក្កដា"
 
 #: js/config.php:54
+msgid "August"
+msgstr "ខែសីហា"
+
+#: js/config.php:55
+msgid "September"
+msgstr "ខែកញ្ញា"
+
+#: js/config.php:56
+msgid "October"
+msgstr "ខែតុលា"
+
+#: js/config.php:57
+msgid "November"
+msgstr "ខែវិច្ឆិកា"
+
+#: js/config.php:58
 msgid "December"
-msgstr ""
+msgstr "ខែធ្នូ"
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
-msgstr ""
+msgstr "ការកំណត់"
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr "កំពុង​រក្សាទុក"
+
+#: js/js.js:995
 msgid "seconds ago"
-msgstr ""
+msgstr "វិនាទី​មុន"
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n នាទី​មុន"
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n ម៉ោង​មុន"
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
-msgstr ""
+msgstr "ថ្ងៃនេះ"
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
-msgstr ""
+msgstr "ម្សិលមិញ"
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n ថ្ងៃ​មុន"
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
-msgstr ""
+msgstr "ខែមុន"
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n ខែ​មុន"
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
-msgstr ""
+msgstr "ខែ​មុន"
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
-msgstr ""
+msgstr "ឆ្នាំ​មុន"
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
-msgstr ""
+msgstr "ឆ្នាំ​មុន"
 
 #: js/oc-dialogs.js:123
 msgid "Choose"
-msgstr ""
+msgstr "ជ្រើស"
 
 #: js/oc-dialogs.js:146
 msgid "Error loading file picker template: {error}"
@@ -210,15 +201,15 @@ msgstr ""
 
 #: js/oc-dialogs.js:172
 msgid "Yes"
-msgstr ""
+msgstr "ព្រម"
 
 #: js/oc-dialogs.js:182
 msgid "No"
-msgstr ""
+msgstr "ទេ"
 
 #: js/oc-dialogs.js:199
 msgid "Ok"
-msgstr ""
+msgstr "ព្រម"
 
 #: js/oc-dialogs.js:219
 msgid "Error loading message template: {error}"
@@ -245,7 +236,7 @@ msgstr ""
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
-msgstr ""
+msgstr "លើកលែង"
 
 #: js/oc-dialogs.js:386
 msgid "Continue"
@@ -263,154 +254,174 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
-msgstr ""
+msgstr "បាន​ចែក​រំលែក"
 
 #: js/share.js:109
 msgid "Share"
-msgstr ""
+msgstr "ចែក​រំលែក"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
-msgstr ""
+msgstr "កំហុស"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
-msgstr ""
+msgstr "កំហុស​ពេល​ចែក​រំលែក"
 
 #: js/share.js:171
 msgid "Error while unsharing"
-msgstr ""
+msgstr "កំពុង​ពេល​លែង​ចែក​រំលែក"
 
 #: js/share.js:178
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
-msgstr ""
+msgstr "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
-msgstr ""
+msgstr "ពាក្យសម្ងាត់"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
-msgstr ""
-
-#: js/share.js:239
-msgid "Set expiration date"
-msgstr ""
+msgstr "ផ្ញើ"
 
 #: js/share.js:240
+msgid "Set expiration date"
+msgstr "កំណត់​ពេល​ផុត​កំណត់"
+
+#: js/share.js:241
 msgid "Expiration date"
-msgstr ""
+msgstr "ពេល​ផុត​កំណត់"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
-msgstr ""
+msgstr "ចែក​រំលែក​តាម​អ៊ីមែល៖"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
-msgstr ""
+msgstr "រក​មិន​ឃើញ​មនុស្ស​ណា​ម្នាក់"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
-msgstr ""
+msgstr "ក្រុម"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
-msgstr ""
+msgstr "លែង​ចែក​រំលែក"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
-msgstr ""
+msgstr "អាច​កែប្រែ"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
-msgstr ""
+msgstr "សិទ្ធិ​បញ្ជា"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
-msgstr ""
+msgstr "បង្កើត"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
-msgstr ""
+msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
-msgstr ""
+msgstr "លុប"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
-msgstr ""
+msgstr "ចែក​រំលែក"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
-msgstr ""
+msgstr "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
-msgstr ""
+msgstr "កំពុង​ផ្ញើ ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
-msgstr ""
+msgstr "បាន​ផ្ញើ​អ៊ីមែល"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
-msgstr ""
+msgstr "បម្រាម"
 
 #: js/tags.js:4
 msgid "The object type is not specified."
-msgstr ""
+msgstr "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។"
 
 #: js/tags.js:13
 msgid "Enter new"
@@ -422,7 +433,7 @@ msgstr "លុប"
 
 #: js/tags.js:31
 msgid "Add"
-msgstr ""
+msgstr "បញ្ចូល"
 
 #: js/tags.js:39
 msgid "Edit tags"
@@ -451,11 +462,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -475,10 +492,10 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
-msgstr ""
+msgstr "ឈ្មោះ​អ្នកប្រើ"
 
 #: lostpassword/templates/lostpassword.php:25
 msgid ""
@@ -498,39 +515,51 @@ msgstr ""
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាត់​របស់​អ្នក​ត្រូវ​បាន​កំណត់​ឡើង​វិញ"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr ""
+msgstr "ទៅ​ទំព័រ​ចូល"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
-msgstr ""
+msgstr "ពាក្យ​សម្ងាត់​ថ្មី"
 
 #: lostpassword/templates/resetpassword.php:11
 msgid "Reset password"
+msgstr "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត"
+
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
 msgstr ""
 
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "ផ្ទាល់​ខ្លួន"
 
 #: strings.php:6
 msgid "Users"
-msgstr ""
+msgstr "អ្នកប្រើ"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
-msgstr ""
+msgstr "កម្មវិធី"
 
 #: strings.php:8
 msgid "Admin"
-msgstr ""
+msgstr "អ្នក​គ្រប់​គ្រង"
 
 #: strings.php:9
 msgid "Help"
-msgstr ""
+msgstr "ជំនួយ"
 
 #: tags/controller.php:22
 msgid "Error loading tags"
@@ -562,11 +591,11 @@ msgstr ""
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "បាន​ហាមឃាត់​ការ​ចូល"
 
 #: templates/404.php:15
 msgid "Cloud not found"
-msgstr ""
+msgstr "រក​មិន​ឃើញ Cloud"
 
 #: templates/altmail.php:2
 #, php-format
@@ -590,7 +619,7 @@ msgstr ""
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
 msgid "Security Warning"
-msgstr ""
+msgstr "បម្រាម​សុវត្ថិភាព"
 
 #: templates/installation.php:26
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
@@ -630,49 +659,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +715,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -714,27 +741,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/km/files.po b/l10n/km/files.po
index d5b5468f56..828078ceda 100644
--- a/l10n/km/files.po
+++ b/l10n/km/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,280 +17,287 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
-msgstr ""
+msgstr "ឯកសារ"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
-msgstr ""
+msgstr "ចែក​រំលែក"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
-msgid "undo"
-msgstr ""
-
 #: js/filelist.js:591
+msgid "undo"
+msgstr "មិន​ធ្វើ​វិញ"
+
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
-msgstr ""
+msgstr "កំហុស"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
-msgstr ""
+msgstr "ឈ្មោះ"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
-msgstr ""
+msgstr "ទំហំ"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -298,14 +305,14 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
-msgstr ""
+msgstr "ផ្ទុក​ឡើង"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -337,74 +344,70 @@ msgstr ""
 
 #: templates/admin.php:26
 msgid "Save"
-msgstr ""
+msgstr "រក្សាទុក"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
-msgstr ""
+msgstr "ថត​ថ្មី"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
-msgstr ""
+msgstr "ថត"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
-msgstr ""
+msgstr "ទាញយក"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "លុប"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/km/files_encryption.po b/l10n/km/files_encryption.po
index 17b2fcd5cb..15f1b5bf05 100644
--- a/l10n/km/files_encryption.po
+++ b/l10n/km/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/km/files_external.po b/l10n/km/files_external.po
index 38f8a6f5ba..343c6971f6 100644
--- a/l10n/km/files_external.po
+++ b/l10n/km/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -63,7 +67,7 @@ msgstr ""
 
 #: templates/settings.php:9 templates/settings.php:28
 msgid "Folder name"
-msgstr ""
+msgstr "ឈ្មោះ​ថត"
 
 #: templates/settings.php:10
 msgid "External storage"
@@ -95,29 +99,29 @@ msgstr ""
 
 #: templates/settings.php:92
 msgid "Groups"
-msgstr ""
+msgstr "ក្រុ"
 
 #: templates/settings.php:100
 msgid "Users"
-msgstr ""
+msgstr "អ្នកប្រើ"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "លុប"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/km/files_sharing.po b/l10n/km/files_sharing.po
index e603aaaa64..bdcdb1e7e6 100644
--- a/l10n/km/files_sharing.po
+++ b/l10n/km/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pongsametrey SOK <metreysk@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,10 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -27,7 +32,7 @@ msgstr ""
 
 #: templates/authenticate.php:10
 msgid "Password"
-msgstr ""
+msgstr "ពាក្យសម្ងាត់"
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
@@ -55,30 +60,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr ""
+msgid "shared by %s"
+msgstr "បាន​ចែក​រំលែក​ដោយ %s"
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/km/files_trashbin.po b/l10n/km/files_trashbin.po
index dbe47b2f7b..724b7c893a 100644
--- a/l10n/km/files_trashbin.po
+++ b/l10n/km/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
-msgid "Error"
+#: js/filelist.js:23
+msgid "Deleted files"
 msgstr ""
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+msgid "Error"
+msgstr "កំហុស"
+
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
-msgstr ""
+msgstr "ឈ្មោះ"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
-msgstr ""
+msgstr "ស្ដារ​មក​វិញ"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "លុប"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/km/files_versions.po b/l10n/km/files_versions.po
index f9b37bb0cc..16c05aa131 100644
--- a/l10n/km/files_versions.po
+++ b/l10n/km/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# សុវិចិត្រ Sovichet ទេព Tep <sovichet.tep@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:47-0400\n"
-"PO-Revision-Date: 2013-09-12 11:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-02-26 12:50+0000\n"
+"Last-Translator: សុវិចិត្រ Sovichet ទេព Tep <sovichet.tep@gmail.com>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,24 +21,24 @@ msgstr ""
 #: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "មិន​អាច​ត្រឡប់៖ %s"
 
-#: js/versions.js:7
+#: js/versions.js:14
 msgid "Versions"
-msgstr ""
+msgstr "កំណែ"
 
-#: js/versions.js:53
+#: js/versions.js:60
 msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "មិន​អាច​ត្រឡប់ {file} ទៅ​កំណែ​សម្រួល {timestamp} បាន​ទេ។"
 
-#: js/versions.js:79
+#: js/versions.js:87
 msgid "More versions..."
-msgstr ""
+msgstr "កំណែ​ច្រើន​ទៀត..."
 
-#: js/versions.js:116
+#: js/versions.js:125
 msgid "No other versions available"
-msgstr ""
+msgstr "មិន​មាន​កំណែ​ផ្សេង​ទៀត​ទេ"
 
-#: js/versions.js:145
+#: js/versions.js:155
 msgid "Restore"
-msgstr ""
+msgstr "ស្ដារ​មក​វិញ"
diff --git a/l10n/km/lib.po b/l10n/km/lib.po
index 87bcd1528a..a9404549af 100644
--- a/l10n/km/lib.po
+++ b/l10n/km/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# សុវិចិត្រ Sovichet ទេព Tep <sovichet.tep@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,74 +18,69 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "មិន​អាច​ដំឡើង​កម្មវិធី \"%s\" បាន ព្រោះ​តែ​វា​មិន​ត្រូវ​គ្នា​នឹង​កំណែ ownCloud នេះ​ទេ។"
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
-msgstr ""
+msgstr "មិន​បាន​បញ្ជាក់​ឈ្មោះ​កម្មវិធី"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
-msgstr ""
+msgstr "ជំនួយ"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
-msgstr ""
+msgstr "ផ្ទាល់​ខ្លួន"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
-msgstr ""
+msgstr "ការកំណត់"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
-msgstr ""
+msgstr "អ្នកប្រើ"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
-msgstr ""
+msgstr "អ្នក​គ្រប់​គ្រង"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
 #: private/avatar.php:66
 msgid "Unknown filetype"
-msgstr ""
+msgstr "មិន​ស្គាល់​ប្រភេទ​ឯកសារ"
 
 #: private/avatar.php:71
 msgid "Invalid image"
-msgstr ""
+msgstr "រូបភាព​មិន​ត្រឹម​ត្រូវ"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
-msgstr ""
-
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
+msgstr "សេវាកម្ម​វេប​ក្រោម​ការ​ការ​បញ្ជា​របស់​អ្នក"
 
 #: private/files.php:231
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "បាន​បិទ​ការ​ទាញ​យក ZIP ។"
 
 #: private/files.php:232
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "ត្រូវ​ការ​ទាញ​យក​ឯកសារ​ម្ដង​មួយៗ។"
 
 #: private/files.php:233 private/files.php:261
 msgid "Back to Files"
-msgstr ""
+msgstr "ត្រឡប់​ទៅ​ឯកសារ"
 
 #: private/files.php:258
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "ឯកសារ​ដែល​បាន​ជ្រើស មាន​ទំហំ​ធំ​ពេក​ក្នុង​ការ​បង្កើត​ជា zip ។"
 
 #: private/files.php:259
 msgid ""
@@ -92,100 +88,104 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
-msgstr ""
+msgstr "មាន​ទីតាំង​ផ្ទុក​កម្មវិធី​រួច​ហើយ"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "មិន​អាច​បង្កើត​ថត​កម្មវិធី។ សូម​កែ​សម្រួល​សិទ្ធិ។ %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
-msgstr ""
+msgstr "មិន​បាន​បើក​កម្មវិធី"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
+msgstr "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ"
+
+#: private/json.php:52
+msgid "Token expired. Please reload page."
 msgstr ""
 
-#: private/json.php:51
-msgid "Token expired. Please reload page."
+#: private/json.php:75
+msgid "Unknown user"
 msgstr ""
 
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
-msgstr ""
+msgstr "ឯកសារ"
 
 #: private/search/provider/file.php:27 private/search/provider/file.php:34
 msgid "Text"
-msgstr ""
+msgstr "អត្ថបទ"
 
 #: private/search/provider/file.php:30
 msgid "Images"
-msgstr ""
+msgstr "រូបភាព"
 
 #: private/setup/abstractdatabase.php:26
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s វាយ​បញ្ចូល​ឈ្មោះ​អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្នន័យ។"
 
 #: private/setup/abstractdatabase.php:29
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s វាយ​បញ្ចូល​ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ។"
 
 #: private/setup/abstractdatabase.php:32
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s អ្នក​អាច​មិន​ប្រើ​សញ្ញា​ចុច​នៅ​ក្នុង​ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ"
 
 #: private/setup/mssql.php:20
 #, php-format
@@ -199,7 +199,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -212,7 +212,7 @@ msgstr ""
 #: private/setup/postgresql.php:125 private/setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "កំហុស DB៖ \"%s\""
 
 #: private/setup/mysql.php:68 private/setup/oci.php:55
 #: private/setup/oci.php:122 private/setup/oci.php:145
@@ -227,25 +227,25 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "មិន​អាច​បង្កើត​ការ​តភ្ជាប់ Oracle"
 
 #: private/setup/oci.php:41 private/setup/oci.php:113
 msgid "Oracle username and/or password not valid"
@@ -258,72 +258,78 @@ msgstr ""
 
 #: private/setup/postgresql.php:23 private/setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "ឈ្មោះ​អ្នក​ប្រើ និង/ឬ ពាក្យ​សម្ងាត់ PostgreSQL គឺ​មិន​ត្រូវ​ទេ"
 
 #: private/setup.php:28
 msgid "Set an admin username."
-msgstr ""
+msgstr "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្រង។"
 
 #: private/setup.php:31
 msgid "Set an admin password."
-msgstr ""
+msgstr "កំណត់​ពាក្យ​សម្ងាត់​អ្នក​គ្រប់គ្រង។"
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
-msgstr ""
-
-#: private/template/functions.php:130
-msgid "seconds ago"
-msgstr ""
-
-#: private/template/functions.php:131
-msgid "%n minute ago"
-msgid_plural "%n minutes ago"
-msgstr[0] ""
-
-#: private/template/functions.php:132
-msgid "%n hour ago"
-msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr "រក​មិន​ឃើញ​ចំណាត់​ក្រុម \"%s\""
 
 #: private/template/functions.php:133
-msgid "today"
-msgstr ""
+msgid "seconds ago"
+msgstr "វិនាទី​មុន"
 
 #: private/template/functions.php:134
-msgid "yesterday"
-msgstr ""
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] "%n នាទី​មុន"
+
+#: private/template/functions.php:135
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] "%n ម៉ោង​មុន"
 
 #: private/template/functions.php:136
-msgid "%n day go"
-msgid_plural "%n days ago"
-msgstr[0] ""
+msgid "today"
+msgstr "ថ្ងៃនេះ"
 
-#: private/template/functions.php:138
-msgid "last month"
-msgstr ""
+#: private/template/functions.php:137
+msgid "yesterday"
+msgstr "ម្សិលមិញ"
 
 #: private/template/functions.php:139
-msgid "%n month ago"
-msgid_plural "%n months ago"
-msgstr[0] ""
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] "%n ថ្ងៃ​មុន"
 
 #: private/template/functions.php:141
-msgid "last year"
-msgstr ""
+msgid "last month"
+msgstr "ខែមុន"
 
 #: private/template/functions.php:142
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] "%n ខែ​មុន"
+
+#: private/template/functions.php:144
+msgid "last year"
+msgstr "ឆ្នាំ​មុន"
+
+#: private/template/functions.php:145
 msgid "years ago"
-msgstr ""
+msgstr "ឆ្នាំ​មុន"
diff --git a/l10n/km/settings.po b/l10n/km/settings.po
index 1da76a89a6..35d2fa646a 100644
--- a/l10n/km/settings.po
+++ b/l10n/km/settings.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pongsametrey SOK <metreysk@gmail.com>, 2014
+# សុវិចិត្រ Sovichet ទេព Tep <sovichet.tep@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,14 +19,56 @@ msgstr ""
 "Language: km\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "បាន​ផ្ញើ​អ៊ីមែល"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "មិនអាចផ្ទុកបញ្ជីកម្មវិធីពី App Store"
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20 changepassword/controller.php:55
 msgid "Authentication error"
-msgstr ""
+msgstr "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
@@ -36,53 +80,53 @@ msgstr ""
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr ""
+msgstr "មាន​ក្រុម​នេះ​រួច​ហើយ"
 
 #: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr ""
+msgstr "មិន​អាច​បន្ថែម​ក្រុម"
 
 #: ajax/lostpassword.php:12
 msgid "Email saved"
-msgstr ""
+msgstr "បាន​រក្សា​ទុក​អ៊ីមែល"
 
 #: ajax/lostpassword.php:14
 msgid "Invalid email"
-msgstr ""
+msgstr "អ៊ីមែល​មិន​ត្រឹម​ត្រូវ"
 
 #: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr ""
+msgstr "មិន​អាច​លុប​ក្រុម​បាន"
 
 #: ajax/removeuser.php:25
 msgid "Unable to delete user"
-msgstr ""
+msgstr "មិន​អាច​លុប​អ្នក​ប្រើ​បាន"
 
 #: ajax/setlanguage.php:15
 msgid "Language changed"
-msgstr ""
+msgstr "បាន​ប្ដូរ​ភាសា"
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr ""
+msgstr "សំណើ​មិន​ត្រឹម​ត្រូវ"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "អ្នក​គ្រប់​គ្រង​មិន​អាច​លុប​ខ្លួន​ឯង​ចេញ​ពី​ក្រុម​អ្នក​គ្រប់​គ្រង​ឡើយ"
 
 #: ajax/togglegroups.php:30
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "មិន​អាច​បន្ថែម​អ្នក​ប្រើ​ទៅ​ក្រុម %s"
 
 #: ajax/togglegroups.php:36
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ​ពី​ក្រុម​ %s"
 
 #: ajax/updateapp.php:14
 msgid "Couldn't update app."
-msgstr ""
+msgstr "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។"
 
 #: changepassword/controller.php:20
 msgid "Wrong password"
@@ -113,110 +157,138 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
-msgstr ""
+msgstr "ធ្វើ​បច្ចុប្បន្នភាព​ទៅ {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
-msgstr ""
+msgstr "បិទ"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
-msgstr ""
+msgstr "បើក"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
-msgstr ""
+msgstr "សូម​រង់​ចាំ...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
-msgstr ""
+msgstr "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
-msgstr ""
+msgstr "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
-msgstr ""
+msgstr "កំហុស"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
-msgstr ""
+msgstr "ធ្វើ​បច្ចុប្បន្នភាព"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
-msgstr ""
+msgstr "បាន​ធ្វើ​បច្ចុប្បន្នភាព"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
-msgstr ""
+msgstr "បាន​លុប"
 
 #: js/users.js:47
 msgid "undo"
-msgstr ""
+msgstr "មិន​ធ្វើ​វិញ"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
-msgstr ""
+msgstr "ក្រុ"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
-msgstr ""
+msgstr "ក្រុម​អ្នក​គ្រប់គ្រង"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "លុប"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
-msgstr ""
+msgstr "បន្ថែម​ក្រុម"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
-msgstr ""
+msgstr "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
-msgstr ""
+msgstr "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
-msgstr ""
+msgstr "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
-msgstr ""
+msgstr "__language_name__"
 
 #: templates/admin.php:8
 msgid "Everything (fatal issues, errors, warnings, info, debug)"
@@ -238,18 +310,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "ចូល"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr "បម្រាម​សុវត្ថិភាព"
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +354,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
-msgstr ""
+msgstr "បម្រាម​ការ​ដំឡើង"
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
-msgstr ""
+msgstr "ខ្វះ​ម៉ូឌុល 'fileinfo'"
 
-#: templates/admin.php:68
+#: 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 ""
+msgstr "ខ្វះ​ម៉ូឌុល 'fileinfo' ។ យើង​សូម​ណែនាំ​ឲ្យ​បើក​ម៉ូឌុល​នេះ ដើម្បី​ទទួល​បាន​លទ្ធផល​ល្អ​នៃ​ការ​សម្គាល់​ប្រភេទ mime ។"
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
-msgstr ""
+msgstr "Locale មិន​ដំណើរការ"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
-msgstr ""
+msgstr "ការ​តភ្ជាប់​អ៊ីនធឺណិត​មិន​មាន​ដំណើរ​ការ"
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +424,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
-msgstr ""
+msgstr "ការ​ចែក​រំលែក"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
-msgstr ""
+msgstr "បើក API ចែក​រំលែក"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
-msgstr ""
+msgstr "អនុញ្ញាត​តំណ"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​តំណ"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
-msgstr ""
+msgstr "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​ជាមួយ​នរណា​ម្នាក់"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
-msgstr ""
+msgstr "សុវត្ថិភាព"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
-msgstr ""
+msgstr "បង្ខំ HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
-msgstr ""
+msgstr "កម្រិត Log"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
-msgstr ""
+msgstr "ច្រើន​ទៀត"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
-msgstr ""
+msgstr "តិច"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
-msgstr ""
+msgstr "កំណែ"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,45 +605,49 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
-msgstr ""
+msgstr "បន្ថែម​កម្មវិធី​របស់​អ្នក"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
-msgstr ""
+msgstr "កម្មវិធី​ច្រើន​ទៀត"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
+msgstr "ជ្រើស​កម្មវិធី​មួយ"
+
+#: templates/apps.php:42
+msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
-msgstr ""
+msgstr "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ"
 
 #: templates/help.php:9
 msgid "Online Documentation"
-msgstr ""
+msgstr "ឯកសារ Online"
 
 #: templates/help.php:11
 msgid "Forum"
-msgstr ""
+msgstr "វេទិកាពិភាក្សា"
 
 #: templates/help.php:14
 msgid "Bugtracker"
-msgstr ""
+msgstr "Bugtracker"
 
 #: templates/help.php:17
 msgid "Commercial Support"
@@ -506,9 +666,9 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
-msgstr ""
+msgstr "ពាក្យសម្ងាត់"
 
 #: templates/personal.php:40
 msgid "Your password was changed"
@@ -518,151 +678,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
-msgstr ""
-
-#: templates/personal.php:44
-msgid "New password"
-msgstr ""
+msgstr "ពាក្យសម្ងាត់​បច្ចុប្បន្ន"
 
 #: templates/personal.php:46
-msgid "Change password"
-msgstr ""
+msgid "New password"
+msgstr "ពាក្យ​សម្ងាត់​ថ្មី"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:50
+msgid "Change password"
+msgstr "ប្តូរ​ពាក្យសម្ងាត់"
+
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
-msgstr ""
+msgstr "អ៊ីមែល"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
-msgstr ""
-
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr ""
+msgstr "អ៊ីម៉ែល​របស់​អ្នក"
 
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "លើកលែង"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
-msgstr ""
+msgstr "ភាសា"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
-msgstr ""
+msgstr "ជួយ​បក​ប្រែ"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "ចូល"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
-msgstr ""
+msgstr "ផ្សេងៗ"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
-msgstr ""
+msgstr "ឈ្មោះ​អ្នកប្រើ"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/km/user_ldap.po b/l10n/km/user_ldap.po
index 8c1ac7598b..5f8d728426 100644
--- a/l10n/km/user_ldap.po
+++ b/l10n/km/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# សុវិចិត្រ Sovichet ទេព Tep <sovichet.tep@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,19 +24,19 @@ msgstr ""
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr ""
+msgstr "លុប​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ មិន​បាន​សម្រេច"
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -60,7 +61,7 @@ msgstr ""
 
 #: js/settings.js:67
 msgid "Deletion failed"
-msgstr ""
+msgstr "លុប​មិន​បាន​សម្រេច"
 
 #: js/settings.js:83
 msgid "Take over settings from recent server configuration?"
@@ -68,11 +69,11 @@ msgstr ""
 
 #: js/settings.js:84
 msgid "Keep settings?"
-msgstr ""
+msgstr "រក្សា​ទុក​ការ​កំណត់?"
 
 #: js/settings.js:99
 msgid "Cannot add server configuration"
-msgstr ""
+msgstr "មិន​អាច​បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ"
 
 #: js/settings.js:127
 msgid "mappings cleared"
@@ -84,47 +85,47 @@ msgstr ""
 
 #: js/settings.js:133
 msgid "Error"
-msgstr ""
+msgstr "កំហុស"
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
-msgstr ""
+msgstr "សាក​ល្បង​ការ​ត​ភ្ជាប់ បាន​ជោគជ័យ"
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
-msgstr ""
+msgstr "សាកល្បង​ការ​តភ្ជាប់ មិន​បាន​សម្រេច"
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
+msgstr "តើ​អ្នក​ពិត​ជា​ចង់​លុប​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ​បច្ចុប្បន្ន​មែន​ទេ?"
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
-msgstr ""
+msgstr "បញ្ជាក់​ការ​លុប"
 
 #: lib/wizard.php:79 lib/wizard.php:93
 #, php-format
@@ -138,17 +139,17 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
 #: templates/part.settingcontrols.php:2
 msgid "Save"
-msgstr ""
+msgstr "រក្សាទុក"
 
 #: templates/part.settingcontrols.php:4
 msgid "Test Configuration"
@@ -156,11 +157,11 @@ msgstr ""
 
 #: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
 msgid "Help"
-msgstr ""
+msgstr "ជំនួយ"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +197,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -220,11 +221,11 @@ msgstr ""
 
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
-msgstr ""
+msgstr "បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ"
 
 #: templates/part.wizard-server.php:30
 msgid "Host"
-msgstr ""
+msgstr "ម៉ាស៊ីន​ផ្ទុក"
 
 #: templates/part.wizard-server.php:31
 msgid ""
@@ -248,7 +249,7 @@ msgstr ""
 
 #: templates/part.wizard-server.php:52
 msgid "Password"
-msgstr ""
+msgstr "ពាក្យសម្ងាត់"
 
 #: templates/part.wizard-server.php:53
 msgid "For anonymous access, leave DN and Password empty."
@@ -264,7 +265,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +408,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +468,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +487,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +513,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/km/user_webdavauth.po b/l10n/km/user_webdavauth.po
index 1b1ffbc431..a6a80670bf 100644
--- a/l10n/km/user_webdavauth.po
+++ b/l10n/km/user_webdavauth.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# សុវិចិត្រ Sovichet ទេព Tep <sovichet.tep@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-13 21:47-0400\n"
-"PO-Revision-Date: 2013-09-12 11:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-02-26 11:50+0000\n"
+"Last-Translator: សុវិចិត្រ Sovichet ទេព Tep <sovichet.tep@gmail.com>\n"
 "Language-Team: Khmer (http://www.transifex.com/projects/p/owncloud/language/km/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,15 +20,15 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ WebDAV"
 
 #: templates/settings.php:4
 msgid "Address: "
-msgstr ""
+msgstr "អាសយដ្ឋាន៖"
 
 #: templates/settings.php:7
 msgid ""
 "The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "អត្តសញ្ញាណ​អ្នក​ប្រើ​នឹង​ត្រូវ​ផ្ញើ​ទៅ​អាសយដ្ឋាន​នេះ។ កម្មវិធី​បន្ថែម​នេះ​ពិនិត្យ​ចម្លើយ​តប ហើយ​នឹង​បក​ស្រាយ​កូដ​ស្ថានភាព HTTP ដូច​ជា 401 និង 403 ថា​ជា​អត្តសញ្ញាណ​មិន​ត្រឹម​ត្រូវ ហើយ​និង​ចម្លើយ​តប​ផ្សេងៗ​ថា​ត្រឹម​ត្រូវ។"
diff --git a/l10n/kn/core.po b/l10n/kn/core.po
index 135a0829e5..26a5f9246e 100644
--- a/l10n/kn/core.po
+++ b/l10n/kn/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,131 +58,135 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -263,6 +253,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -271,12 +281,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -288,123 +298,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -451,11 +461,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -475,8 +491,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -512,6 +528,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -520,7 +548,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -630,49 +658,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +714,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -714,27 +740,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/kn/files.po b/l10n/kn/files.po
index 31a4b49208..7d748ebfa9 100644
--- a/l10n/kn/files.po
+++ b/l10n/kn/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,233 +76,228 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -298,12 +305,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -339,72 +346,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/kn/files_encryption.po b/l10n/kn/files_encryption.po
index bf8a4cc0e4..583e9d5bd4 100644
--- a/l10n/kn/files_encryption.po
+++ b/l10n/kn/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/kn/files_external.po b/l10n/kn/files_external.po
index 61e30ed382..4a33e25339 100644
--- a/l10n/kn/files_external.po
+++ b/l10n/kn/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/kn/files_sharing.po b/l10n/kn/files_sharing.po
index 56abd76eca..ab5742aad4 100644
--- a/l10n/kn/files_sharing.po
+++ b/l10n/kn/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/kn/files_trashbin.po b/l10n/kn/files_trashbin.po
index 15941b3799..5e3bacaffe 100644
--- a/l10n/kn/files_trashbin.po
+++ b/l10n/kn/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/kn/lib.po b/l10n/kn/lib.po
index 93d65f06c4..01945d87b2 100644
--- a/l10n/kn/lib.po
+++ b/l10n/kn/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,62 +267,68 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/kn/settings.po b/l10n/kn/settings.po
index a61d69bc14..cfb8736938 100644
--- a/l10n/kn/settings.po
+++ b/l10n/kn/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/kn/user_ldap.po b/l10n/kn/user_ldap.po
index dc913170ac..43493a88ca 100644
--- a/l10n/kn/user_ldap.po
+++ b/l10n/kn/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 212e85bb4a..4d28ccc174 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # 책읽는달팽 <bjh13579@gmail.com>, 2013
+# Harim Park <fofwisdom@gmail.com>, 2014
 # madeng <jongyoul@gmail.com>, 2013
 # madeng <jongyoul@gmail.com>, 2013
 # Park Shinjo <peremen@gmail.com>, 2013
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-29 01:55-0500\n"
-"PO-Revision-Date: 2013-12-28 13:54+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,12 +24,11 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s 님이 %s을(를) 공유하였습니다"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "%s 님에게 메일을 보낼 수 없습니다."
@@ -45,19 +45,6 @@ msgstr "유지 보수 모드 꺼짐"
 msgid "Updated database"
 msgstr "데이터베이스 업데이트 됨"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "파일 캐시 업데이트 중, 시간이 약간 걸릴 수 있습니다..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "파일 캐시 업데이트 됨"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% 완료됨 ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "이미지나 파일이 없음"
@@ -78,131 +65,135 @@ msgstr "사용 가능한 프로필 사진이 없습니다. 다시 시도하십
 msgid "No crop data provided"
 msgstr "선택된 데이터가 없습니다."
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "일요일"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "월요일"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "화요일"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "수요일"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "목요일"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "금요일"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "토요일"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "1월"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "2월"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "3월"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "4월"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "5월"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "6월"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "7월"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "8월"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "9월"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "10월"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "11월"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "12월"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "저장 중..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "초 전"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n분 전 "
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n시간 전 "
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "오늘"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "어제"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n일 전 "
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "지난 달"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n달 전 "
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "개월 전"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "작년"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "년 전"
 
@@ -269,6 +260,26 @@ msgstr "({count}개 선택됨)"
 msgid "Error loading file exists template"
 msgstr "파일 존재함 템플릿을 불러오는 중 오류 발생"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "매우 약한 암호"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "약한 암호"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "그저 그런 암호"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "좋은 암호"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "강력한 암호"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "공유됨"
@@ -277,12 +288,12 @@ msgstr "공유됨"
 msgid "Share"
 msgstr "공유"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "오류"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "공유하는 중 오류 발생"
 
@@ -294,123 +305,123 @@ msgstr "공유 해제하는 중 오류 발생"
 msgid "Error while changing permissions"
 msgstr "권한 변경하는 중 오류 발생"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner} 님이 공유 중"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "사용자 및 그룹과 공유..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "링크 공유"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "암호 보호"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "암호"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "공개 업로드 허용"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "이메일 주소"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "전송"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "만료 날짜 설정"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "만료 날짜"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "이메일로 공유:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "발견된 사람 없음"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "그룹"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "다시 공유할 수 없습니다"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "{user} 님과 {item}에서 공유 중"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "공유 해제"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "이메일로 알림"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "편집 가능"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "접근 제어"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "생성"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "업데이트"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "삭제"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "공유"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "암호로 보호됨"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "만료 날짜 해제 오류"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "만료 날짜 설정 오류"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "전송 중..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "이메일 발송됨"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "경고"
 
@@ -457,11 +468,17 @@ msgstr "업데이트가 실패하였습니다. 이 문제를 <a href=\"https://g
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "업데이트가 성공하였습니다. ownCloud로 돌아갑니다."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s 암호 재설정"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}"
@@ -481,8 +498,8 @@ msgstr "요청이 실패했습니다!<br>이메일 주소와 사용자 이름을
 msgid "You will receive a link to reset your password via Email."
 msgstr "이메일로 암호 재설정 링크를 보냈습니다."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "사용자 이름"
 
@@ -518,6 +535,18 @@ msgstr "새 암호"
 msgid "Reset password"
 msgstr "암호 재설정"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "개인"
@@ -526,7 +555,7 @@ msgstr "개인"
 msgid "Users"
 msgstr "사용자"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "앱"
 
@@ -636,49 +665,47 @@ msgstr "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_bla
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>관리자 계정</strong> 만들기"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "고급"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "스토리지 & 데이터베이스"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "데이터 폴더"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "데이터베이스 설정"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "사용될 예정"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "데이터베이스 사용자"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "데이터베이스 암호"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "데이터베이스 이름"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "데이터베이스 테이블 공간"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "데이터베이스 호스트"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "설치 완료"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "완료 중 ..."
 
@@ -694,7 +721,7 @@ msgstr "이 애플리케이션을 올바르게 사용하려면 자바스크립
 msgid "%s is available. Get more information on how to update."
 msgstr "%s을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 자세한 정보를 얻으십시오."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "로그아웃"
 
@@ -720,28 +747,28 @@ msgstr "서버 인증 실패!"
 msgid "Please contact your administrator."
 msgstr "관리자에게 문의하십시오."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "암호를 잊으셨습니까?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "기억하기"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "로그인"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "대체 로그인"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "안녕하세요,<br><br>%s 님이 %s을(를) 공유하였음을 알려 드립니다.<br><a href=\"%s\">지금 보기!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 7ae321b6ab..45ee79b1c1 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-29 01:55-0500\n"
-"PO-Revision-Date: 2013-12-28 22:06+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,280 +23,287 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "항목 %s을(를) 이동시킬 수 없음 - 같은 이름의 파일이 이미 존재함"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "항목 %s을(를) 이동시킬 수 없음"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "파일 이름이 비어 있을 수 없습니다."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "파일 이름에는 \"/\"가 들어갈 수 없습니다. 다른 이름을 사용하십시오."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "이름 %s이(가) 폴더 %s에서 이미 사용 중입니다. 다른 이름을 사용하십시오."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "올바르지 않은 원본"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "서버에서 URL을 열 수 없습니다. 서버 설정을 확인하십시오"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "%s을(를) %s(으)로 다운로드하는 중 오류 발생"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "파일 생성 중 오류 발생"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "폴더 이름이 비어있을 수 없습니다."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "폴더 이름에는 \"/\"가 들어갈 수 없습니다. 다른 이름을 사용하십시오."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "폴더 생성 중 오류 발생"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "업로드 디렉터리를 설정할 수 없습니다."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "잘못된 토큰"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "파일이 업로드 되지 않았습니다. 알 수 없는 오류입니다"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "파일 업로드에 성공하였습니다."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "업로드한 파일 크기가 HTML 폼의 MAX_FILE_SIZE보다 큼"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "파일의 일부분만 업로드됨"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "파일이 업로드되지 않았음"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "임시 폴더가 없음"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "디스크에 쓰지 못했습니다"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "저장소가 용량이 충분하지 않습니다."
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "업로드에 실패했습니다. 파일 정보를 가져올 수 없습니다."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "업로드에 실패했습니다. 업로드할 파일을 찾을 수 없습니다"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "업로드에 실패했습니다. 파일 정보를 가져올 수 없습니다."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "올바르지 않은 디렉터리입니다."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "파일"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다."
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "여유 공간이 부족합니다"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "업로드가 취소되었습니다."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "서버에서 결과를 가져올 수 없습니다."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL이 비어있을 수 없음"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "'공유됨'은 홈 폴더의 예약된 파일 이름임"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name}이(가) 이미 존재함"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "파일을 만들 수 없음"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "폴더를 만들 수 없음"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "URL을 가져올 수 없음"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "공유"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "영구히 삭제"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "이름 바꾸기"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "대기 중"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "이름을 변경할 수 없음"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name}이(가) {new_name}(으)로 대체됨"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "실행 취소"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "파일 삭제 오류."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "폴더 %n개"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "파일 %n개"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} 그리고 {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "파일 %n개 업로드 중"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' 는 올바르지 않은 파일 이름입니다."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "암호화는 해제되어 있지만, 파일은 아직 암호화되어 있습니다. 개인 설정에서 파일을 복호화하십시오."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "다운로드 준비 중입니다. 파일 크기가 크면 시간이 오래 걸릴 수도 있습니다."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "파일 이동 오류"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "오류"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "이름"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "수정됨"
 
@@ -304,12 +311,12 @@ msgstr "수정됨"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "폴더 이름이 잘못되었습니다. '공유됨'은 예약된 폴더 이름입니다."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s의 이름을 변경할 수 없습니다"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "업로드"
 
@@ -345,72 +352,68 @@ msgstr "ZIP 파일 최대 크기"
 msgid "Save"
 msgstr "저장"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "새로 만들기"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "새 텍스트 파일"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "텍스트 파일"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "새 폴더"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "폴더"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "링크에서"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "삭제된 파일"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "업로드 취소"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "여기에 파일을 업로드하거나 만들 권한이 없습니다"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "내용이 없습니다. 업로드할 수 있습니다!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "업로드한 파일이 너무 큼"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "파일을 검색하고 있습니다. 기다려 주십시오."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "현재 검색"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "파일 시스템 캐시 업그레이드 중..."
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 87e1438ba0..45a5e1ad77 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-29 01:55-0500\n"
-"PO-Revision-Date: 2013-12-28 13:54+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,18 +84,18 @@ msgid ""
 "administrator"
 msgstr "알 수 없는 오류. 시스템 설정을 확인하거나 관리자에게 문의하십시오."
 
-#: hooks/hooks.php:62
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "요구 사항이 부족합니다."
 
-#: hooks/hooks.php:63
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "PHP 5.3.3 이상 설치 여부, PHP의 OpenSSL 확장 기능 활성화 및 설정 여부를 확인하십시오. 암호화 앱이 비활성화 되었습니다."
 
-#: hooks/hooks.php:281
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "다음 사용자는 암호화를 사용할 수 없습니다:"
 
@@ -103,9 +103,9 @@ msgstr "다음 사용자는 암호화를 사용할 수 없습니다:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "저장 중..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 34002f8c63..af6f96583d 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "접근 허가됨"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Dropbox 저장소 설정 오류"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "접근 권한 부여"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "올바른 Dropbox 앱 키와 암호를 입력하십시오."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Google 드라이브 저장소 설정 오류"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>경고:</b> \"smbclient\"가 설치되지 않았습니다. CIFS/SMB 공유 자원에 연결할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>경고:</b> PHP FTP 지원이 비활성화되어 있거나 설치되지 않았습니다. FTP 공유를 마운트할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "사용자"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "사용자 외부 저장소 사용"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "사용자별 외부 저장소 마운트 허용"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL 루트 인증서"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "루트 인증서 가져오기"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 7d21cd8d9d..9d574617b6 100644
--- a/l10n/ko/files_sharing.po
+++ b/l10n/ko/files_sharing.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-24 01:55-0500\n"
-"PO-Revision-Date: 2013-12-22 14:24+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "{owner} 님이 공유함"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "이 공유는 암호로 보호되어 있습니다"
@@ -56,32 +60,16 @@ msgstr "공유가 비활성화됨"
 msgid "For more info, please ask the person who sent this link."
 msgstr "자세한 정보는 링크를 보낸 사람에게 문의하십시오."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s 님이 폴더 %s을(를) 공유하였습니다"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s 님이 파일 %s을(를) 공유하였습니다"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "다운로드"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "업로드"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "업로드 취소"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "다음 항목을 미리 볼 수 없음:"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "직접 링크"
diff --git a/l10n/ko/files_trashbin.po b/l10n/ko/files_trashbin.po
index 3b26bd329b..2e42d08c62 100644
--- a/l10n/ko/files_trashbin.po
+++ b/l10n/ko/files_trashbin.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-29 01:55-0500\n"
-"PO-Revision-Date: 2013-12-28 13:54+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,21 +20,25 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s을(를_ 영구적으로 삭제할 수 없습니다"
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "%s을(를) 복원할 수 없습니다"
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "삭제된 파일"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "오류"
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "복원됨"
 
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index b1fbf71876..c1cc5c2331 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-24 01:55-0500\n"
-"PO-Revision-Date: 2013-12-22 14:20+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,38 +22,38 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 \"%s\" 앱을 설치할 수 없습니다."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "앱 이름이 지정되지 않았습니다."
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "도움말"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "개인"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "설정"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "사용자"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "관리자"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "\"%s\" 업그레이드에 실패했습니다."
@@ -66,15 +66,10 @@ msgstr "알 수 없는 파일 형식"
 msgid "Invalid image"
 msgstr "잘못된 그림"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "내가 관리하는 웹 서비스"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "\"%s\"을(를) 열 수 없습니다."
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP 다운로드가 비활성화 되었습니다."
@@ -97,74 +92,78 @@ msgid ""
 "administrator."
 msgstr "작은 조각들 안에 들어있는 파일들을 받고자 하신다면, 나누어서 받으시거나 혹은 시스템 관리자에게 정중하게 물어보십시오"
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "앱을 설치할 때 소스가 지정되지 않았습니다."
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "http에서 앱을 설치할 때 href가 지정되지 않았습니다."
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다."
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "%s 타입 아카이브는 지원되지 않습니다."
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "앱을 설치할 때 아카이브를 열지 못했습니다."
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "앱에서 info.xml 파일이 제공되지 않았습니다."
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다."
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다."
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "출시되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다."
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다."
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "앱 디렉터리가 이미 존재합니다."
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "앱 폴더를 만들 수 없습니다. 권한을 수정하십시오. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "앱이 활성화되지 않았습니다"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "인증 오류"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "토큰이 만료되었습니다. 페이지를 새로 고치십시오."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "파일"
@@ -204,8 +203,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "기존 계정이나 administrator(관리자)를 입력해야 합니다."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL 사용자 이름이나 암호가 잘못되었습니다."
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -232,21 +231,21 @@ msgstr "잘못된 명령: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL 사용자 '%s'@'localhost'이(가) 이미 존재합니다."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "이 사용자를 MySQL에서 삭제하십시오"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL 사용자 '%s'@'%%'이(가) 이미 존재합니다."
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "이 사용자를 MySQL에서 삭제하십시오."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -273,62 +272,68 @@ msgstr "관리자의 사용자 이름을 설정합니다."
 msgid "Set an admin password."
 msgstr "관리자의 암호를 설정합니다."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s 님이 %s을(를) 공유하였습니다"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "분류 \"%s\"을(를) 찾을 수 없습니다."
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "초 전"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n분 전 "
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n시간 전 "
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "오늘"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "어제"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n일 전 "
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "지난 달"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n달 전 "
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "작년"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "년 전"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index cb273b0aac..65a843dddb 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # 책읽는달팽 <bjh13579@gmail.com>, 2013
+# Harim Park <fofwisdom@gmail.com>, 2014
 # Park Shinjo <peremen@gmail.com>, 2013
 # Shinjo Park <kde@peremen.name>, 2013
 # 책읽는달팽 <bjh13579@gmail.com>, 2013
@@ -11,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-30 01:55-0500\n"
-"PO-Revision-Date: 2013-12-29 14:50+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +22,48 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "이메일 발송됨"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "암호화"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "앱 스토어에서 목록을 가져올 수 없습니다"
@@ -117,62 +160,90 @@ msgstr "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 
 msgid "Unable to change password"
 msgstr "암호를 변경할 수 없음"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "보내는 중..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "사용자 문서"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "운영자 문서"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "버전 {appversion}(으)로 업데이트"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "사용 안함"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "사용함"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "기다려 주십시오...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "앱을 비활성화하는 중 오류 발생"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "앱을 활성화하는 중 오류 발생"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "업데이트 중...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "앱을 업데이트하는 중 오류 발생"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "오류"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "업데이트"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "업데이트됨"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "프로필 사진 선택"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "매우 약한 암호"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "약한 암호"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "그저 그런 암호"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "좋은 암호"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "강력한 암호"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "저장 중..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "삭제됨"
@@ -185,40 +256,40 @@ msgstr "실행 취소"
 msgid "Unable to remove user"
 msgstr "사용자를 삭제할 수 없음"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "그룹"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "그룹 관리자"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "삭제"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "그룹 추가"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "올바른 사용자 이름을 입력해야 함"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "사용자 생성 오류"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "올바른 암호를 입력해야 함"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "경고: 사용자 \"{user}\"의 홈 디렉터리가 이미 존재합니다"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "한국어"
 
@@ -242,18 +313,42 @@ msgstr "오류, 치명적 문제"
 msgid "Fatal issues only"
 msgstr "치명적 문제만"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "없음"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "로그인"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "보안 경고"
 
-#: templates/admin.php:25
+#: 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:39
+#: 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 "
@@ -262,68 +357,68 @@ msgid ""
 "root."
 msgstr "데이터 디렉터리와 파일을 인터넷에서 접근할 수도 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 접근할 수 없도록 하거나, 웹 서버 문서 경로 외부로 데이터 디렉터리를 옮기십시오."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "설정 경고"
 
-#: templates/admin.php:53
+#: 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:54
+#: 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:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "모듈 'fileinfo'가 없음"
 
-#: templates/admin.php:68
+#: 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 "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "PHP 버전이 오래됨"
 
-#: templates/admin.php:82
+#: 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 버전이 오래되었습니다. 오래된 버전은 작동하지 않을 수도 있기 때문에 PHP 5.3.8 이상을 사용하는 것을 추천합니다."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "로캘이 작동하지 않음"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "UTF-8을 지원하는 시스템 로캘을 사용할 수 없습니다."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "파일 이름의 일부 문자에 문제가 생길 수도 있습니다."
 
-#: templates/admin.php:106
+#: 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:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "인터넷에 연결할 수 없음"
 
-#: templates/admin.php:121
+#: 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 "
@@ -332,118 +427,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 일부 기능을 사용할 수 없습니다. 외부에서 파일에 접근하거나 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "크론"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "개별 페이지를 불러올 때마다 실행"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php는 webcron 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "시스템의 cron 서비스를 통하여 15분마다 cron.php 파일에 접근합니다."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "공유"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "공유 API 사용하기"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "앱에서 공유 API를 사용할 수 있도록 허용"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "링크 허용"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "사용자가 개별 항목의 링크를 공유할 수 있도록 허용"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "공개 업로드 허용"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "다른 사용자들이 공개된 공유 폴더에 파일 업로드 허용"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "재공유 허용"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "사용자에게 공유된 항목을 다시 공유할 수 있도록 허용"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "누구나와 공유할 수 있도록 허용"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "사용자가 속해 있는 그룹의 사용자에게만 공유할 수 있도록 허용"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "메일 알림 허용"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "사용자에게 공유 파일에 대한 메일 알림을 허용합니다"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "보안"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "HTTPS 강제 사용"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "전자우편 서버"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "보낸 이 주소"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "인증 필요함"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "서버 주소"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "포트"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "자격 정보"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "SMTP 사용자명"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "SMTP 암호"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "시험용 전자우편 설정"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "전자우편 보내기"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "로그 단계"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "더 중요함"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "덜 중요함"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "버전"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -453,30 +608,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "내 앱 추가"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "더 많은 앱"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "앱 선택"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "문서"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com에 있는 앱 페이지를 참고하십시오"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-라이선스됨: <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "사용자 문서"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "관리자 문서"
@@ -510,7 +669,7 @@ msgstr "첫 실행 마법사 다시 보이기"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "현재 공간 중 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "암호"
 
@@ -522,151 +681,149 @@ msgstr "암호가 변경되었습니다"
 msgid "Unable to change your password"
 msgstr "암호를 변경할 수 없음"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "현재 암호"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "새 암호"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "암호 변경"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "전체 이름"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "이메일"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "이메일 주소"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "프로필 사진"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "새로 업로드"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "파일에서 선택"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "그림 삭제"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "png나 jpg를 사용하십시오. 정사각형 형태가 가장 좋지만 잘라낼 수 있습니다."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "원본 계정의 아바타를 사용합니다."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "중지"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "취소"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "프로필 이미지로 사용"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "언어"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "번역 돕기"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "암호화"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다."
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "로그인 암호"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "모든 파일 복호화"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "로그인 이름"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "만들기"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "관리자 복구 암호"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "기본 저장소"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "무제한"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "기타"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "사용자 이름"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "저장소"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "전체 이름 변경"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "새 암호 설정"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "기본값"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 9fd54b6889..06500e88a3 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-29 01:55-0500\n"
-"PO-Revision-Date: 2013-12-28 13:55+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,43 +89,43 @@ msgstr "성공"
 msgid "Error"
 msgstr "오류"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "설정 올바름"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "설정 올바르지 않음"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "설정 불완전함"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "그룹 선택"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "객체 클래스 선택"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "속성 선택"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "연결 시험 성공"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "연결 시험 실패"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "현재 서버 설정을 지우시겠습니까?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "삭제 확인"
 
@@ -141,11 +141,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] "사용자 %s명 찾음"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "잘못된 호스트"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "필요한 기능을 찾을 수 없음"
 
@@ -163,8 +163,8 @@ msgstr "도움말"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "다음 조건을 만족하는 그룹만 %s 접근 허용:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -199,8 +199,8 @@ msgid "groups found"
 msgstr "그룹 찾음"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "로그인 이름으로 사용할 속성:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -267,8 +267,8 @@ msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "다음 조건을 만족하는 사용자만 %s 접근 허용:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -410,41 +410,51 @@ msgstr "그룹 검색 속성"
 msgid "Group-Member association"
 msgstr "그룹-회원 연결"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "특수 속성"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "할당량 필드"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "기본 할당량"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "바이트 단위"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "이메일 필드"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "사용자 홈 폴더 이름 규칙"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "내부 사용자 이름"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +470,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "기본적으로 내부 사용자 이름은 UUID 속성에서 생성됩니다. 사용자 이름이 중복되지 않고 문자열을 변환할 필요가 없도록 합니다. 내부 사용자 이름에는 다음과 같은 문자열만 사용할 수 있습니다: [a-zA-Z0-9_.@-] 다른 문자열은 ASCII에 해당하는 문자열로 변경되거나 없는 글자로 취급됩니다. 충돌하는 경우 숫자가 붙거나 증가합니다. 내부 사용자 이름은 내부적으로 사용자를 식별하는 데 사용되며, 사용자 홈 폴더의 기본 이름입니다. 또한 *DAV와 같은 외부 URL의 일부로 사용됩니다. 이 설정을 사용하면 기본 설정을 재정의할 수 있습니다. ownCloud 5 이전의 행동을 사용하려면 아래 필드에 사용자의 표시 이름 속성을 입력하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자에게만 적용됩니다."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "내부 사용자 이름 속성:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "UUID 확인 재정의"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +489,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "기본적으로 UUID 속성은 자동적으로 감지됩니다. UUID 속성은 LDAP 사용자와 그룹을 정확히 식별하는 데 사용됩니다. 지정하지 않은 경우 내부 사용자 이름은 UUID를 기반으로 생성됩니다. 이 설정을 다시 정의하고 임의의 속성을 지정할 수 있습니다. 사용자와 그룹 모두에게 속성을 적용할 수 있고 중복된 값이 없는지 확인하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자와 그룹에만 적용됩니다."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "사용자 UUID 속성:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "그룹 UUID 속성:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "사용자 이름-LDAP 사용자 매핑"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +515,10 @@ msgid ""
 "experimental stage."
 msgstr "사용자 이름은 (메타) 데이터를 저장하고 할당하는 데 사용됩니다. 사용자를 정확하게 식별하기 위하여 각각 LDAP 사용자는 내부 사용자 이름을 갖습니다. 이는 사용자 이름과 LDAP 사용자 간의 매핑이 필요합니다. 생성된 사용자 이름은 LDAP 사용자의 UUID로 매핑됩니다. 추가적으로 LDAP 통신을 줄이기 위해서 DN이 캐시에 저장되지만 식별에 사용되지는 않습니다. DN이 변경되면 변경 사항이 기록됩니다. 내부 사용자 이름은 계속 사용됩니다. 매핑을 비우면 흔적이 남아 있게 됩니다. 매핑을 비우는 작업은 모든 LDAP 설정에 영향을 줍니다! 테스트 및 실험 단계에만 사용하고, 사용 중인 서버에서는 시도하지 마십시오."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "사용자 이름-LDAP 사용자 매핑 비우기"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "그룹 이름-LDAP 그룹 매핑 비우기"
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index e1f373f400..305363b858 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "پاشکه‌وتده‌کات..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -214,11 +204,11 @@ msgstr ""
 
 #: js/oc-dialogs.js:172
 msgid "Yes"
-msgstr ""
+msgstr "بەڵێ"
 
 #: js/oc-dialogs.js:182
 msgid "No"
-msgstr ""
+msgstr "نەخێر"
 
 #: js/oc-dialogs.js:199
 msgid "Ok"
@@ -250,7 +240,7 @@ msgstr ""
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
-msgstr ""
+msgstr "لابردن"
 
 #: js/oc-dialogs.js:386
 msgid "Continue"
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr "هاوبەشی کردن"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "ئاگاداری"
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "ناوی به‌کارهێنه‌ر"
 
@@ -517,6 +533,18 @@ msgstr "وشەی نهێنی نوێ"
 msgid "Reset password"
 msgstr "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr "به‌كارهێنه‌ر"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "به‌رنامه‌كان"
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "هه‌ڵبژاردنی پیشكه‌وتوو"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "زانیاری فۆڵده‌ر"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "به‌كارهێنه‌ری داتابه‌یس"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "وشه‌ی نهێنی داتا به‌یس"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "ناوی داتابه‌یس"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "هۆستی داتابه‌یس"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "كۆتایی هات ده‌ستكاریه‌كان"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "چوونەدەرەوە"
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index d373fd5e63..36645752f1 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
-msgstr ""
+msgstr "په‌ڕگەکان"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "هاوبەشی کردن"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "ناو"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "بارکردن"
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr "پاشکه‌وتکردن"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "بوخچه"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "داگرتن"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index bf253a766a..71292777a0 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "پاشکه‌وتده‌کات..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index 39319cbb04..763ce3e955 100644
--- a/l10n/ku_IQ/files_external.po
+++ b/l10n/ku_IQ/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "به‌كارهێنه‌ر"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ku_IQ/files_sharing.po b/l10n/ku_IQ/files_sharing.po
index f77cf5baba..72907a19e7 100644
--- a/l10n/ku_IQ/files_sharing.po
+++ b/l10n/ku_IQ/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s دابه‌شی کردووه‌ بوخچه‌ی %s له‌گه‌ڵ تۆ"
-
-#: templates/public.php:21
-#, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s دابه‌شی کردووه‌ په‌ڕگه‌یی %s له‌گه‌ڵ تۆ"
-
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "داگرتن"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "بارکردن"
-
-#: templates/public.php:59
-msgid "Cancel upload"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "هیچ پێشبینیه‌ك ئاماده‌ نیه بۆ"
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ku_IQ/files_trashbin.po b/l10n/ku_IQ/files_trashbin.po
index 85e8f58d37..3033241801 100644
--- a/l10n/ku_IQ/files_trashbin.po
+++ b/l10n/ku_IQ/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr "ناو"
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index 9c805fbc4c..898c855015 100644
--- a/l10n/ku_IQ/lib.po
+++ b/l10n/ku_IQ/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "یارمەتی"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "به‌كارهێنه‌ر"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "به‌ڕێوه‌به‌ری سه‌ره‌كی"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,77 +87,81 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
-msgstr ""
+msgstr "په‌ڕگەکان"
 
 #: private/search/provider/file.php:27 private/search/provider/file.php:34
 msgid "Text"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index cc492115e2..2ce49de9cc 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "نهێنیکردن"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "چالاککردن"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "نوێکردنه‌وه"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "پاشکه‌وتده‌کات..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "هیچ"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "چوونەژوورەوە"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "ناونیشانی ڕاژه"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "وشەی نهێنی نوێ"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "ئیمه‌یل"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "لابردن"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "نهێنیکردن"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "چوونەژوورەوە"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "ناوی به‌کارهێنه‌ر"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index 1158ecfddd..4635426b59 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "سه‌رکه‌وتن"
 msgid "Error"
 msgstr "هه‌ڵه"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "یارمەتی"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index b4188cede1..aea34c2568 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-28 01:55-0500\n"
-"PO-Revision-Date: 2013-12-27 13:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +19,11 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "Den/D' %s huet »%s« mat dir gedeelt"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -41,19 +40,6 @@ msgstr "Maintenance Modus ass aus"
 msgid "Updated database"
 msgstr "Datebank ass geupdate ginn"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "De Fichier Cache gëtt geupdate, des ka laang daueren..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "De Fichier Cache ass geupdate ginn"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% fäerdeg ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Kee Bild oder Fichier uginn"
@@ -74,135 +60,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Sonndeg"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Méindeg"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Dënschdeg"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Mëttwoch"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Donneschdeg"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Freideg"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Samschdeg"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mäerz"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Abrëll"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mee"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Dezember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Speicheren..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "Sekonnen hir"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n Minutt hir"
 msgstr[1] "%n Minutten hir"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "haut"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "gëschter"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "leschte Mount"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "Méint hir"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "Lescht Joer"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "Joren hir"
 
@@ -270,6 +260,26 @@ msgstr "({count} ausgewielt)"
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Gedeelt"
@@ -278,12 +288,12 @@ msgstr "Gedeelt"
 msgid "Share"
 msgstr "Deelen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Feeler"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Feeler beim Deelen"
 
@@ -295,123 +305,123 @@ msgstr "Feeler beim Annuléiere vum Deelen"
 msgid "Error while changing permissions"
 msgstr "Feeler beim Ännere vun de Rechter"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Gedeelt mat dir an der Grupp {group} vum {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Gedeelt mat dir vum {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Link deelen"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Passwuertgeschützt"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Passwuert"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Ëffentlechen Upload erlaaben"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Link enger Persoun mailen"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Schécken"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Verfallsdatum setzen"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Verfallsdatum"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Via E-Mail deelen:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Keng Persoune fonnt"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "Grupp"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Weiderdeelen ass net erlaabt"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Gedeelt an {item} mat {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Net méi deelen"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "via e-mail Bescheed ginn"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "kann änneren"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "Zougrëffskontroll"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "aktualiséieren"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "läschen"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "deelen"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Passwuertgeschützt"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Feeler beim Läsche vum Verfallsdatum"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Feeler beim Setze vum Verfallsdatum"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Gëtt geschéckt..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email geschéckt"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Warnung"
 
@@ -458,11 +468,17 @@ msgstr "Den Update war net erfollegräich. Mell dëse Problem w.e.gl der<a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s Passwuert ass nei gesat"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}"
@@ -482,8 +498,8 @@ msgstr "Ufro feelfeschloen!<br>Hues du séchergestallt dass deng Email respektiv
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Benotzernumm"
 
@@ -519,6 +535,18 @@ msgstr "Neit Passwuert"
 msgid "Reset password"
 msgstr "Passwuert zréck setzen"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Perséinlech"
@@ -527,7 +555,7 @@ msgstr "Perséinlech"
 msgid "Users"
 msgstr "Benotzer"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Applikatiounen"
 
@@ -637,49 +665,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "En <strong>Admin-Account</strong> uleeën"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avancéiert"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Daten-Dossier"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "D'Datebank konfiguréieren"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "wärt benotzt ginn"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datebank-Benotzer"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Datebank-Passwuert"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Datebank Numm"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tabelle-Plaz vun der Datebank"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Datebank-Server"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Schléissen of ..."
 
@@ -695,7 +721,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Ofmellen"
 
@@ -721,27 +747,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Passwuert vergiess?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "verhalen"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Umellen"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternativ Umeldungen"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 0b0406f933..9f74628eee 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Keen Feeler, Datei ass komplett ropgelueden ginn"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Et ass kee Fichier ropgeluede ginn"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Et feelt en temporären Dossier"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Konnt net op den Disk schreiwen"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Dateien"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Deelen"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Ëm-benennen"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Fehler"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Geännert"
 
@@ -301,12 +308,12 @@ msgstr "Geännert"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Eroplueden"
 
@@ -342,72 +349,68 @@ msgstr "Maximal Gréisst fir ZIP Fichieren"
 msgid "Save"
 msgstr "Späicheren"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nei"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Text Fichier"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Dossier"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass näischt. Lued eppes rop!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Momentane Scan"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index 62f7497545..e812e1d71d 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Speicheren..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index dfe41bc2b9..da271f5570 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Benotzer"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index b31690b8d6..bda126eb82 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -54,32 +58,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s huet den Dossier %s mad der gedeelt"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s deelt den Fichier %s mad dir"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Download"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Eroplueden"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Upload ofbriechen"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Keeng Preview do fir"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/lb/files_trashbin.po b/l10n/lb/files_trashbin.po
index dfbe45800e..647f1b6f63 100644
--- a/l10n/lb/files_trashbin.po
+++ b/l10n/lb/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Fehler"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Numm"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Läschen"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index 022fc34107..1bec6207b7 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hëllef"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Perséinlech"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Astellungen"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Benotzer"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -62,15 +62,10 @@ msgstr "Onbekannten Fichier Typ"
 msgid "Invalid image"
 msgstr "Ongülteg d'Bild"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Web-Servicer ënnert denger Kontroll"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Authentifikatioun's Fehler"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Dateien"
@@ -200,7 +199,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -228,20 +227,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -269,66 +268,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "Den/D' %s huet »%s« mat dir gedeelt"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "Sekonnen hir"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n Minutten hir"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "haut"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "gëschter"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "Läschte Mount"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "Läscht Joer"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "Joren hier"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index e6c9568f23..dc9db7025c 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-28 01:55-0500\n"
-"PO-Revision-Date: 2013-12-27 13:21+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email geschéckt"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Konnt Lescht net vum App Store lueden"
@@ -114,61 +156,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Ofschalten"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aschalten"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Fehler"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Update"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Speicheren..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -182,40 +252,40 @@ msgstr "réckgängeg man"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Gruppen"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Gruppen Admin"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Läschen"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Login"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sécherheets Warnung"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Share API aschalten"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Erlab Apps d'Share API ze benotzen"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Links erlaben"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Resharing erlaben"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Useren erlaben mat egal wiem ze sharen"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Server Adress"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Méi"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Manner"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,28 +604,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Setz deng App bei"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Wiel eng Applikatioun aus"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un"
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -507,7 +665,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passwuert"
 
@@ -519,151 +677,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr "Konnt däin Passwuert net änneren"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Momentan 't Passwuert"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Neit Passwuert"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Passwuert änneren"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Deng Email Adress"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Ofbriechen"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Sprooch"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Hëllef iwwersetzen"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "Login"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Erstellen"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Aner"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Benotzernumm"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 3f2a7d8244..4edf0855c4 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-28 01:55-0500\n"
-"PO-Revision-Date: 2013-12-27 13:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Fehler"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "Hëllef"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index f01c67df45..5a431dd644 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Dr. ROX <to.dr.rox@gmail.com>, 2013
-# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013-2014
 # mambuta <vspyshkin@gmail.com>, 2013
 # Roman Deniobe <rms200x@gmail.com>, 2013
 # fizikiukas <fizikiukas@gmail.com>, 2013
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,12 +22,11 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s pasidalino »%s« su tavimi"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nepavyko nusiųsti el. pašto šiems naudotojams: %s "
@@ -44,19 +43,6 @@ msgstr "Išjungta priežiūros veiksena"
 msgid "Updated database"
 msgstr "Atnaujinta duomenų bazė"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Atnaujinama failų talpykla, tai gali užtrukti labai ilgai..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Atnaujinta failų talpykla"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% atlikta ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Nenurodytas paveikslėlis ar failas"
@@ -77,139 +63,143 @@ msgstr "Nėra laikino profilio paveikslėlio, bandykite dar kartą"
 msgid "No crop data provided"
 msgstr "Nenurodyti apkirpimo duomenys"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Sausis"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Vasaris"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Kovas"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Balandis"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Gegužė"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Birželis"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Liepa"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Rugsėjis"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Spalis"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Lapkritis"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Gruodis"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Saugoma..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] " prieš %n minutę"
 msgstr[1] " prieš %n minučių"
 msgstr[2] " prieš %n minučių"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "prieš %n valandą"
 msgstr[1] "prieš %n valandų"
 msgstr[2] "prieš %n valandų"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "šiandien"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "prieš %n dieną"
 msgstr[1] "prieš %n dienas"
 msgstr[2] "prieš %n dienų"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "prieš %n mėnesį"
 msgstr[1] "prieš %n mėnesius"
 msgstr[2] "prieš %n mėnesių"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "prieš mėnesį"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "prieš metus"
 
@@ -278,6 +268,26 @@ msgstr "({count} pažymėtų)"
 msgid "Error loading file exists template"
 msgstr "Klaida įkeliant esančių failų ruošinį"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Dalinamasi"
@@ -286,12 +296,12 @@ msgstr "Dalinamasi"
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Klaida"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Klaida, dalijimosi metu"
 
@@ -303,123 +313,123 @@ msgstr "Klaida, kai atšaukiamas dalijimasis"
 msgid "Error while changing permissions"
 msgstr "Klaida, keičiant privilegijas"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Pasidalino su Jumis ir {group} grupe {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Pasidalino su Jumis {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Dalintis su vartotoju arba grupe..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Dalintis nuoroda"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Apsaugotas slaptažodžiu"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Leisti viešą įkėlimą"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Nusiųsti nuorodą paštu"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Siųsti"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Nustatykite galiojimo laiką"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Galiojimo laikas"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Dalintis per el. paštą:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Žmonių nerasta"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupė"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Dalijinasis išnaujo negalimas"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Pasidalino {item} su {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "pranešti el. paštu"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "gali redaguoti"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "priėjimo kontrolė"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "sukurti"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "atnaujinti"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "ištrinti"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "dalintis"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Apsaugota slaptažodžiu"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laiką"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laiką"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Siunčiama..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Laiškas išsiųstas"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Įspėjimas"
 
@@ -453,7 +463,7 @@ msgstr "Trynimui nepasirinkta jokia žymė."
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr ""
+msgstr "Prašome perkrauti puslapį."
 
 #: js/update.js:17
 msgid ""
@@ -466,11 +476,17 @@ msgstr "Atnaujinimas buvo nesėkmingas. PApie tai prašome pranešti the <a href
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s slaptažodžio atnaujinimas"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Slaptažodio atkūrimui naudokite šią nuorodą: {link}"
@@ -490,8 +506,8 @@ msgstr "Klaida!<br>Ar tikrai jūsų el paštas/vartotojo vardas buvo teisingi?"
 msgid "You will receive a link to reset your password via Email."
 msgstr "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Prisijungimo vardas"
 
@@ -509,7 +525,7 @@ msgstr "Taip, aš tikrai noriu atnaujinti slaptažodį"
 
 #: lostpassword/templates/lostpassword.php:30
 msgid "Reset"
-msgstr ""
+msgstr "Atstatyti"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -527,6 +543,18 @@ msgstr "Naujas slaptažodis"
 msgid "Reset password"
 msgstr "Atkurti slaptažodį"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Asmeniniai"
@@ -535,7 +563,7 @@ msgstr "Asmeniniai"
 msgid "Users"
 msgstr "Vartotojai"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Programos"
 
@@ -569,11 +597,11 @@ msgstr "Klaida šalinant žymę"
 
 #: tags/controller.php:97
 msgid "Error favoriting"
-msgstr ""
+msgstr "Klaida įtraukiant į mėgstamus."
 
 #: tags/controller.php:108
 msgid "Error unfavoriting"
-msgstr ""
+msgstr "Klaida pašalinant iš mėgstamų."
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -596,7 +624,7 @@ msgstr "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s."
-msgstr ""
+msgstr "Bendrinimo laikas baigsis %s."
 
 #: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
@@ -645,49 +673,47 @@ msgstr "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serve
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sukurti <strong>administratoriaus paskyrą</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Išplėstiniai"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Duomenų katalogas"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Nustatyti duomenų bazę"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "bus naudojama"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Duomenų bazės vartotojas"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Duomenų bazės slaptažodis"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Duomenų bazės pavadinimas"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Duomenų bazės loginis saugojimas"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Duomenų bazės serveris"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Baigti diegimą"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Baigiama ..."
 
@@ -696,14 +722,14 @@ msgid ""
 "This application requires JavaScript to be enabled for correct operation.  "
 "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
 "JavaScript</a> and re-load this interface."
-msgstr ""
+msgstr "Šiai programai reikia įjungti  JavaScript, kad ji veiktų tvarkingai.  Prašome <a href=\"http://enable-javascript.com/\" target=\"_blank\">įjungti JavaScript</a> ir perkrauti šią sąsają."
 
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Atsijungti"
 
@@ -729,36 +755,36 @@ msgstr "Autentikacija serveryje nepavyko!"
 msgid "Please contact your administrator."
 msgstr "Kreipkitės į savo sistemos administratorių."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Pamiršote slaptažodį?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "prisiminti"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Prisijungti"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternatyvūs prisijungimai"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
-msgstr ""
+msgstr "Ši ownCloud sistema yra vieno naudotojo veiksenoje."
 
 #: templates/singleuser.user.php:4
 msgid "This means only administrators can use the instance."
-msgstr ""
+msgstr "Tai reiškia, kad tik administratorius gali naudotis sistema."
 
 #: templates/singleuser.user.php:5 templates/update.user.php:5
 msgid ""
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 5c4b37ac04..7d18340212 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # Dr. ROX <to.dr.rox@gmail.com>, 2013
-# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013-2014
 # fizikiukas <fizikiukas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,299 +20,306 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Nepavyko perkelti %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Failo pavadinimas negali būti tuščias."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Failo pavadinime negali būti simbolio \"/\". Prašome pasirinkti kitokį pavadinimą."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Pavadinimas %s jau naudojamas aplanke %s. Prašome pasirinkti kitokį pavadinimą."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Netinkamas šaltinis"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
+msgstr "Serveriui neleidžiama atverti URL, prašome patikrinti serverio konfigūraciją"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Klaida siunčiant %s į %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Klaida kuriant failą"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Aplanko pavadinimas negali būti tuščias."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Aplanko pavadinime negali būti simbolio \"/\". Prašome pasirinkti kitokį pavadinimą."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Klaida kuriant aplanką"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Nepavyksta nustatyti įkėlimų katalogo."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Netinkamas ženklas"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Failai nebuvo įkelti dėl nežinomos priežasties"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Failas įkeltas sėkmingai, be klaidų"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Įkeliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Failas buvo įkeltas tik dalinai"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Nebuvo įkeltas joks failas"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Nėra laikinojo katalogo"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Nepavyko įrašyti į diską"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Nepakanka vietos serveryje"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Įkėlimas nepavyko. Nepavyko gauti failo informacijos."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Įkėlimas nepavyko. Nepavyko rasti įkelto failo"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Įkėlimas nepavyko. Nepavyko gauti failo informacijos."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Neteisingas aplankas"
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Failai"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Nepakanka vietos"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Nepavyko gauti rezultato iš serverio."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL negali būti tuščias."
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
-msgstr ""
+msgstr "Pradiniame aplanke failo pavadinimas „Shared“ yra rezervuotas"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Neįmanoma sukurti failo"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Neįmanoma sukurti aplanko"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
-msgstr ""
+msgstr "Klauda gaunant URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Dalintis"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Ištrinti negrįžtamai"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Neįmanoma pervadinti failo"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "pakeiskite {new_name} į {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Klaida trinant failą."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n aplankas"
 msgstr[1] "%n aplankai"
 msgstr[2] "%n aplankų"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n failas"
 msgstr[1] "%n failai"
 msgstr[2] "%n failų"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} ir {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Įkeliamas %n failas"
 msgstr[1] "Įkeliami %n failai"
 msgstr[2] "Įkeliama %n failų"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' yra neleidžiamas failo pavadinime."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Jūsų visa vieta serveryje užimta"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Šifravimo programa įjungta, bet Jūsų raktai nėra pritaikyti. Prašome atsijungti ir vėl prisijungti"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Netinkamas privatus raktas Šifravimo programai. Prašome atnaujinti savo privataus rakto slaptažodį asmeniniuose nustatymuose, kad atkurti prieigą prie šifruotų failų."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Jūsų atsisiuntimas yra paruošiamas. tai gali užtrukti jei atsisiunčiamas didelis failas."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Klaida perkeliant failą"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Klaida"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Pakeista"
 
 #: lib/app.php:60
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
-msgstr ""
+msgstr "Netinkamas aplanko pavadinimas. „Shared“ pavadinimas yra rezervuotas."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s negali būti pervadintas"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Įkelti"
 
@@ -348,72 +355,68 @@ msgstr "Maksimalus ZIP archyvo failo dydis"
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Naujas"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
-msgstr ""
+msgstr "Naujas tekstinis failas"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Teksto failas"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Naujas aplankas"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Katalogas"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Iš nuorodos"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ištrinti failai"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Atšaukti siuntimą"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Jūs neturite leidimo čia įkelti arba kurti failus"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Čia tuščia. Įkelkite ką nors!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Įkėlimui failas per didelis"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Bandomų įkelti failų dydis viršija maksimalų, kuris leidžiamas šiame serveryje"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, prašome palaukti."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Šiuo metu skenuojama"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Atnaujinamas sistemos kešavimas..."
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 27ef1ae134..9dfe56a42a 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # Dr. ROX <to.dr.rox@gmail.com>, 2013
-# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013-2014
 # fizikiukas <fizikiukas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +69,7 @@ msgid ""
 "Your private key is not valid! Likely your password was changed outside of "
 "%s (e.g. your corporate directory). You can update your private key password"
 " in your personal settings to recover access to your encrypted files."
-msgstr ""
+msgstr "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų."
 
 #: files/error.php:19
 msgid ""
@@ -83,28 +83,28 @@ msgid ""
 "administrator"
 msgstr "Neatpažinta klaida, patikrinkite sistemos nustatymus arba kreipkitės į savo sistemos aministratorių"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Trūkstami laukai."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Sekantys naudotojai nenustatyti šifravimui:"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Saugoma..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 1bd0e58511..79161e530c 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Min2liz <min2lizz@gmail.com>\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Priėjimas suteiktas"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Klaida nustatinėjant Dropbox talpyklą"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Suteikti priėjimą"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\"."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Klaida nustatinėjant Google Drive talpyklą"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Įspėjimas:</b> \"smbclient\" nėra įdiegtas. CIFS/SMB dalinimasis nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas \"smbclient\""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Įspėjimas:</b> FTP palaikymas PHP sistemoje nėra įjungtas arba nėra įdiegtas.  FTP dalinimosi įjungimas nėra galimas. Prašome susisiekti su sistemos administratoriumi kad būtų įdiegtas FTP palaikymas. "
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Vartotojai"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Įjungti vartotojų išorines saugyklas"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Leisti vartotojams pridėti savo išorines saugyklas"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL sertifikatas"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Įkelti pagrindinį sertifikatą"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index c3e0330b89..4698175896 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/files_sharing.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Bendrina {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Turinys apsaugotas slaptažodžiu"
@@ -56,32 +60,16 @@ msgstr "dalinimasis yra išjungtas"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s pasidalino su jumis %s aplanku"
+msgid "shared by %s"
+msgstr "pasidalino %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s pasidalino su jumis %s failu"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Atsisiųsti"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Įkelti"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Atšaukti siuntimą"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Peržiūra nėra galima"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Tiesioginė nuoroda"
diff --git a/l10n/lt_LT/files_trashbin.po b/l10n/lt_LT/files_trashbin.po
index f971c03d48..078fbb550d 100644
--- a/l10n/lt_LT/files_trashbin.po
+++ b/l10n/lt_LT/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +19,48 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nepavyko negrįžtamai ištrinti %s"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Nepavyko atkurti %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Ištrinti failai"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Klaida"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "atstatyta"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nieko nėra. Jūsų šiukšliadėžė tuščia!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Atstatyti"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Ištrinti"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Ištrinti failai"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 6126902344..a3d06e1c28 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,38 +21,38 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Programa „%s“ negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Nenurodytas programos pavadinimas"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Pagalba"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Vartotojai"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administravimas"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Nepavyko pakelti  „%s“ versijos."
@@ -65,15 +65,10 @@ msgstr "Nežinomas failo tipas"
 msgid "Invalid image"
 msgstr "Netinkamas paveikslėlis"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "nepavyksta atverti „%s“"
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP atsisiuntimo galimybė yra išjungta."
@@ -96,74 +91,78 @@ msgid ""
 "administrator."
 msgstr "Prašome atsisiųsti failus mažesnėmis dalimis atskirai, arba mandagiai prašykite savo administratoriaus."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Nenurodytas šaltinis diegiant programą"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Nenurodytas href diegiant programą iš http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Nenurodytas kelias diegiant programą iš vietinio failo"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "%s tipo archyvai nepalaikomi"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Nepavyko atverti archyvo diegiant programą"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Programa nepateikia info.xml failo"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Programa negali būti įdiegta, nes turi neleistiną kodą"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Programa negali būti įdiegta, nes turi <shipped>true</shipped> žymę, kuri yra neleistina ne kartu platinamoms programoms"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Programos aplankas jau egzistuoja"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Nepavyksta sukurti aplanko. Prašome pataisyti leidimus. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Programa neįjungta"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Autentikacijos klaida"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Sesija baigėsi. Prašome perkrauti puslapį."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Failai"
@@ -203,8 +202,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Neteisingas MySQL naudotojo vardas ir/arba slaptažodis"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -231,21 +230,21 @@ msgstr "Vykdyta komanda buvo: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL naudotojas '%s'@'localhost' jau egzistuoja."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Pašalinti šį naudotoją iš MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL naudotojas '%s'@'%%' jau egzistuoja"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Pašalinti šį naudotoją iš MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -272,70 +271,76 @@ msgstr "Nustatyti administratoriaus naudotojo vardą."
 msgid "Set an admin password."
 msgstr "Nustatyti administratoriaus slaptažodį."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s pasidalino »%s« su tavimi"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nepavyko rasti kategorijos „%s“"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "prieš %n min."
 msgstr[1] "Prieš % minutes"
 msgstr[2] "Prieš %n minučių"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Prieš %n valandą"
 msgstr[1] "Prieš %n valandas"
 msgstr[2] "Prieš %n valandų"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "šiandien"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "vakar"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "Prieš %n dieną"
 msgstr[1] "Prieš %n dienas"
 msgstr[2] "Prieš %n dienų"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Prieš %n mėnesį"
 msgstr[1] "Prieš %n mėnesius"
 msgstr[2] "Prieš %n mėnesių"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "praeitais metais"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "prieš metus"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 42738b2868..5e45ec42c6 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -5,16 +5,16 @@
 # Translators:
 # Dr. ROX <to.dr.rox@gmail.com>, 2013
 # fizikiukas <fizikiukas@gmail.com>, 2013
-# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013
+# Liudas Ališauskas <liudas.alisauskas@gmail.com>, 2013-2014
 # Liudas <liudas@aksioma.lt>, 2013
 # fizikiukas <fizikiukas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +22,48 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Laiškas išsiųstas"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Šifravimas"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo"
@@ -118,62 +160,90 @@ msgstr "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo rakta
 msgid "Unable to change password"
 msgstr "Nepavyksta pakeisti slaptažodžio"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Naudotojo dokumentacija"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Atnaujinti iki {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Išjungti"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Įjungti"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Prašome palaukti..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Klaida išjungiant programą"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Klaida įjungiant programą"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Atnaujinama..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Įvyko klaida atnaujinant programą"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Klaida"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Atnaujinti"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Atnaujinta"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Pažymėkite profilio paveikslėlį"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Iššifruojami failai... Prašome palaukti, tai gali užtrukti."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Saugoma..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "ištrinta"
@@ -186,40 +256,40 @@ msgstr "anuliuoti"
 msgid "Unable to remove user"
 msgstr "Nepavyko ištrinti vartotojo"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupės"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupės administratorius"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "pridėti grupę"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Vartotojo vardas turi būti tinkamas"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Klaida kuriant vartotoją"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Slaptažodis turi būti tinkamas"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Įspėjimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Kalba"
 
@@ -241,20 +311,44 @@ msgstr ""
 
 #: templates/admin.php:12
 msgid "Fatal issues only"
+msgstr "Tik kritinės problemos"
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Nieko"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Prisijungti"
+
+#: templates/admin.php:18
+msgid "Plain"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Saugumo pranešimas"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -263,68 +357,68 @@ msgid ""
 "root."
 msgstr "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Nustatyti perspėjimą"
 
-#: templates/admin.php:53
+#: 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 "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Prašome pažiūrėkite dar kartą <a href=\"%s\">diegimo instrukcijas</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Trūksta 'fileinfo' modulio"
 
-#: templates/admin.php:68
+#: 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 "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokalė neveikia"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Nėra interneto ryšio"
 
-#: templates/admin.php:121
+#: 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 "
@@ -333,118 +427,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kas 15 minučių per http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Naudoti sistemos planuotų užduočių paslaugą, kad iškvieti cron.php kas 15 minučių."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Dalijimasis"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Įjungti Share API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Leidžia programoms naudoti Share API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Lesti nuorodas"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Leisti naudotojams viešai dalintis elementais su nuorodomis"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Leisti viešus įkėlimus"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Leisti dalintis"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Leisti naudotojams toliau dalintis elementais pasidalintais su jais"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Leisti naudotojams dalintis su bet kuo"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Leisti naudotojams dalintis tik su naudotojais savo grupėje"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Leisti el. pašto perspėjimą"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Leisti naudotojui siųsti perspėjimą el. laišku dėl bendrinamų failų"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Saugumas"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Reikalauti HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Verčia klientus jungtis prie %s per šifruotą ryšį."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Serverio adresas"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Prievadas"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Žurnalo išsamumas"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Daugiau"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mažiau"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -454,30 +608,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Pridėti programėlę"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Daugiau aplikacijų"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Pasirinkite programą"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Žiūrėti programos puslapį svetainėje apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Naudotojo dokumentacija"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administratoriaus dokumentacija"
@@ -511,7 +669,7 @@ msgstr "Rodyti pirmo karto vedlį dar kartą"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Slaptažodis"
 
@@ -523,151 +681,149 @@ msgstr "Jūsų slaptažodis buvo pakeistas"
 msgid "Unable to change your password"
 msgstr "Neįmanoma pakeisti slaptažodžio"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Dabartinis slaptažodis"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Naujas slaptažodis"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
-msgstr ""
+msgstr "Pilnas vardas"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "El. Paštas"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Jūsų el. pašto adresas"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilio paveikslėlis"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Įkelti naują"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Pasirinkti naują iš failų"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Pašalinti paveikslėlį"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Atšaukti"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Pasirinkite profilio paveiksliuką"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Kalba"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Padėkite išversti"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Šifravimas"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Prisijungimo slaptažodis"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Iššifruoti visus failus"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Vartotojo vardas"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Sukurti"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Administracinis atkūrimo slaptažodis"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Numatytas saugojimas"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Neribota"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Kita"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Prisijungimo vardas"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Saugojimas"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
-msgstr ""
+msgstr "keisti pilną vardą"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "nustatyti naują slaptažodį"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Numatytasis"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 742bca400a..074b556700 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,43 +88,43 @@ msgstr "Sėkmingai"
 msgid "Error"
 msgstr "Klaida"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Pasirinkti grupes"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Ryšio patikrinimas pavyko"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Ryšio patikrinimas nepavyko"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Patvirtinkite trynimą"
 
@@ -144,11 +144,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -166,7 +166,7 @@ msgstr "Pagalba"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -202,7 +202,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -270,7 +270,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -413,41 +413,51 @@ msgstr "Grupės paieškos atributai"
 msgid "Group-Member association"
 msgstr "Grupės-Nario sąsaja"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Specialūs atributai"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kvotos laukas"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Numatyta kvota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "baitais"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "El. pašto laukas"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Naudotojo namų aplanko pavadinimo taisyklė"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Vidinis naudotojo vardas"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -463,15 +473,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Vidinis naudotojo vardo atributas:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Perrašyti UUID aptikimą"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -482,19 +492,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Naudotojo vardo - LDAP naudotojo sąsaja"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -508,10 +518,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Išvalyti naudotojo vardo - LDAP naudotojo sąsają"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 5e89b7c6e5..fb37ca57ae 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s kopīgots »%s« ar jums"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -73,139 +59,143 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Svētdiena"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Otrdiena"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Trešdiena"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Ceturtdiena"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Piektdiena"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sestdiena"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Janvāris"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februāris"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Marts"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Aprīlis"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maijs"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Jūnijs"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Jūlijs"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Augusts"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Septembris"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktobris"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Novembris"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Decembris"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Saglabā..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekundes atpakaļ"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "Tagad, %n minūtes"
 msgstr[1] "Pirms %n minūtes"
 msgstr[2] "Pirms %n minūtēm"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "Šodien, %n stundas"
 msgstr[1] "Pirms %n stundas"
 msgstr[2] "Pirms %n stundām"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "šodien"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "Šodien, %n dienas"
 msgstr[1] "Pirms %n dienas"
 msgstr[2] "Pirms %n dienām"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "pagājušajā mēnesī"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "Šomēnes, %n mēneši"
 msgstr[1] "Pirms %n mēneša"
 msgstr[2] "Pirms %n mēnešiem"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "mēnešus atpakaļ"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "gājušajā gadā"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "gadus atpakaļ"
 
@@ -274,6 +264,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Kopīgs"
@@ -282,12 +292,12 @@ msgstr "Kopīgs"
 msgid "Share"
 msgstr "Dalīties"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Kļūda, daloties"
 
@@ -299,123 +309,123 @@ msgstr "Kļūda, beidzot dalīties"
 msgid "Error while changing permissions"
 msgstr "Kļūda, mainot atļaujas"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} dalījās ar jums un grupu {group}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner} dalījās ar jums"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Aizsargāt ar paroli"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Parole"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Ļaut publisko augšupielādi."
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Sūtīt saiti personai pa e-pastu"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Sūtīt"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Iestaties termiņa datumu"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Termiņa datums"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Dalīties, izmantojot e-pastu:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Nav atrastu cilvēku"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupa"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Atkārtota dalīšanās nav atļauta"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Dalījās ar {item} ar {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Pārtraukt dalīšanos"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "var rediģēt"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "piekļuves vadība"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "izveidot"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "atjaunināt"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "dzēst"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "dalīties"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Aizsargāts ar paroli"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Kļūda, noņemot termiņa datumu"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Kļūda, iestatot termiņa datumu"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sūta..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Vēstule nosūtīta"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Brīdinājums"
 
@@ -462,11 +472,17 @@ msgstr "Atjaunināšana beidzās nesekmīgi. Lūdzu, ziņojiet par šo problēmu
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s paroles maiņa"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Izmantojiet šo saiti, lai mainītu paroli: {link}"
@@ -486,8 +502,8 @@ msgstr "Pieprasījums neizdevās!<br>Vai Jūs pārliecinājāties ka epasts/liet
 msgid "You will receive a link to reset your password via Email."
 msgstr "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Lietotājvārds"
 
@@ -523,6 +539,18 @@ msgstr "Jauna parole"
 msgid "Reset password"
 msgstr "Mainīt paroli"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personīgi"
@@ -531,7 +559,7 @@ msgstr "Personīgi"
 msgid "Users"
 msgstr "Lietotāji"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Lietotnes"
 
@@ -641,49 +669,47 @@ msgstr "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"
 msgid "Create an <strong>admin account</strong>"
 msgstr "Izveidot <strong>administratora kontu</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Paplašināti"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datu mape"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Konfigurēt datubāzi"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "tiks izmantots"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Datubāzes lietotājs"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Datubāzes parole"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Datubāzes nosaukums"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Datubāzes tabulas telpa"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Datubāzes serveris"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Pabeigt iestatīšanu"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -699,7 +725,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s ir pieejams. Uzziniet vairāk kā atjaunināt."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Izrakstīties"
 
@@ -725,27 +751,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Aizmirsāt paroli?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "atcerēties"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Ierakstīties"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternatīvās pieteikšanās"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 65bec5be94..23f5f3998b 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,286 +18,293 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Nevarēja pārvietot %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Datnes nosaukums nevar būt tukšs."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Nevar uzstādīt augšupielādes mapi."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Nepareiza pilnvara"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Netika augšupielādēta neviena datne. Nezināma kļūda"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Viss kārtībā, datne augšupielādēta veiksmīga"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Augšupielādētā datne pārsniedz MAX_FILE_SIZE norādi, kas ir norādīta HTML formā"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Augšupielādētā datne ir tikai daļēji augšupielādēta"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Neviena datne netika augšupielādēta"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Trūkst pagaidu mapes"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Neizdevās saglabāt diskā"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Nav pietiekami daudz vietas"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Nederīga direktorija."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Datnes"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Nepietiek brīvas vietas"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Augšupielāde ir atcelta."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} jau eksistē"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Dalīties"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Dzēst pavisam"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Pārsaukt"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "aizvietoja {new_name} ar {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "atsaukt"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapes"
 msgstr[1] "%n mape"
 msgstr[2] "%n mapes"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n faili"
 msgstr[1] "%n fails"
 msgstr[2] "%n faili"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n"
 msgstr[1] "Augšupielāde %n failu"
 msgstr[2] "Augšupielāde %n failus"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' ir nederīgs datnes nosaukums."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Tiek sagatavota lejupielāde. Tas var aizņemt kādu laiciņu, ja datnes ir lielas."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Mainīts"
 
@@ -305,12 +312,12 @@ msgstr "Mainīts"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nevar tikt pārsaukts"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Augšupielādēt"
 
@@ -346,72 +353,68 @@ msgstr "Maksimālais ievades izmērs ZIP datnēm"
 msgid "Save"
 msgstr "Saglabāt"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Jauna"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Teksta datne"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Jauna mape"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Mape"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "No saites"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Dzēstās datnes"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Atcelt augšupielādi"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Dzēst"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Datne ir par lielu, lai to augšupielādētu"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Augšupielādējamās datnes pārsniedz servera pieļaujamo datņu augšupielādes apjomu"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Datnes šobrīd tiek caurskatītas, lūdzu, uzgaidiet."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Šobrīd tiek caurskatīts"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Uzlabo datņu sistēmas kešatmiņu..."
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index cdb1639c56..bff5224e34 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Saglabā..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index f3f1ea0a20..893a11ac47 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: stendec <stendec@inbox.lv>\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Piešķirta pieeja"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Kļūda, konfigurējot Dropbox krātuvi"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Piešķirt pieeju"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Kļūda, konfigurējot Google Drive krātuvi"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Brīdinājums:</b> nav uzinstalēts “smbclient”. Nevar montēt CIFS/SMB koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Brīdinājums: </b> uz PHP nav aktivēts vai instalēts FTP atbalsts. Nevar montēt FTP koplietojumus. Lūdzu, vaicājiet savam sistēmas administratoram, lai to uzinstalē."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Lietotāji"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Dzēst"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Aktivēt lietotāja ārējo krātuvi"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Ļaut lietotājiem montēt pašiem savu ārējo krātuvi"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL saknes sertifikāti"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importēt saknes sertifikātus"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 0c023d14cb..c55209b6fc 100644
--- a/l10n/lv/files_sharing.po
+++ b/l10n/lv/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Dalījās {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s ar jums dalījās ar mapi %s"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s ar jums dalījās ar datni %s"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Lejupielādēt"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Augšupielādēt"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Atcelt augšupielādi"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Nav pieejams priekšskatījums priekš"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/lv/files_trashbin.po b/l10n/lv/files_trashbin.po
index 7d9d3b0117..9ff1e8319b 100644
--- a/l10n/lv/files_trashbin.po
+++ b/l10n/lv/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nevarēja pilnībā izdzēst %s"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Nevarēja atjaunot %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Dzēstās datnes"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Kļūda"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "atjaunots"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Šeit nekā nav. Jūsu miskaste ir tukša!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nosaukums"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Atjaunot"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Dzēsts"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Dzēst"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Dzēstās datnes"
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 7a1a5ed242..6e2a1e8b9c 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Palīdzība"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personīgi"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Lietotāji"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administratori"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Kļūda atjauninot \"%s\""
@@ -62,15 +62,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "tīmekļa servisi tavā varā"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "Nevar atvērt \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP lejupielādēšana ir izslēgta."
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Lietotne nav aktivēta"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Autentifikācijas kļūda"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Pilnvarai ir beidzies termiņš. Lūdzu, pārlādējiet lapu."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Datnes"
@@ -200,8 +199,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Jums jāievada vai nu esošs vai administratora konts."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Nav derīga MySQL parole un/vai lietotājvārds"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -228,21 +227,21 @@ msgstr "Vainīgā komanda bija “%s”"
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL lietotājs %s'@'localhost' jau eksistē."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Izmest šo lietotāju no MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL lietotājs '%s'@'%%' jau eksistē"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Izmest šo lietotāju no MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -269,70 +268,76 @@ msgstr "Iestatiet administratora lietotājvārdu."
 msgid "Set an admin password."
 msgstr "Iestatiet administratora paroli."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s kopīgots »%s« ar jums"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nevarēja atrast kategoriju “%s”"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekundes atpakaļ"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "Pirms %n minūtēm"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "Pirms %n stundām"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "šodien"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "vakar"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "Pirms %n dienām"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "pagājušajā mēnesī"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "Pirms %n mēnešiem"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "gājušajā gadā"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "gadus atpakaļ"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 009d1d8e25..cb79419f22 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Vēstule nosūtīta"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Šifrēšana"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Nevar lejupielādēt sarakstu no lietotņu veikala"
@@ -114,62 +156,90 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Lietotāja dokumentācija"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Atjaunināt uz {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Deaktivēt"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aktivēt"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Lūdzu, uzgaidiet...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Atjaunina...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Kļūda, atjauninot lietotni"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Atjaunināt"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Atjaunināta"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Saglabā..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "izdzests"
@@ -182,40 +252,40 @@ msgstr "atsaukt"
 msgid "Unable to remove user"
 msgstr "Nevar izņemt lietotāju"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupas"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupas administrators"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Dzēst"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "pievienot grupu"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Jānorāda derīgs lietotājvārds"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Kļūda, veidojot lietotāju"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Jānorāda derīga parole"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__valodas_nosaukums__"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Nav"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Ierakstīties"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Brīdinājums par drošību"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Iestatīšanas brīdinājums"
 
-#: templates/admin.php:53
+#: 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 "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Lūdzu kārtīgi izlasiet <a href=\"%s\">uzstādīšanas norādījumus</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Trūkst modulis “fileinfo”"
 
-#: templates/admin.php:68
+#: 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 "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokāle nestrādā"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Interneta savienojums nedarbojas"
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Izpildīt vienu uzdevumu ar katru ielādēto lapu"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Dalīšanās"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktivēt koplietošanas API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Ļauj lietotnēm izmantot koplietošanas API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Atļaut saites"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Ļaut lietotājiem publiski dalīties ar vienumiem, izmantojot saites"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Atļaut publisko augšupielādi"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Ļaut lietotājiem iespējot atļaut citiem augšupielādēt failus viņu publiskajās mapēs"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Atļaut atkārtotu koplietošanu"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Ļaut lietotājiem dalīties ar vienumiem atkārtoti"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Ļaut lietotājiem dalīties ar visiem"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Ļaut lietotājiem dalīties ar lietotājiem to grupās"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Drošība"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Uzspiest HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu"
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Servera adrese"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Ports"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Akreditācijas dati"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Žurnāls"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Žurnāla līmenis"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Vairāk"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mazāk"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versija"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +604,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Pievieno savu lietotni"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Vairāk lietotņu"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Izvēlies lietotni"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Apskati lietotņu lapu — apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Lietotāja dokumentācija"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administratora dokumentācija"
@@ -507,7 +665,7 @@ msgstr "Vēlreiz rādīt pirmās palaišanas vedni"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Parole"
 
@@ -519,151 +677,149 @@ msgstr "Jūru parole tika nomainīta"
 msgid "Unable to change your password"
 msgstr "Nevar nomainīt jūsu paroli"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Pašreizējā parole"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Jauna parole"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Mainīt paroli"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-pasts"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Jūsu e-pasta adrese"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Ievadiet e-pasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Atcelt"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Valoda"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Palīdzi tulkot"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Šifrēšana"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Pieslēgšanās parole"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Atšifrēt visus failus"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Ierakstīšanās vārds"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Izveidot"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Administratora atgūšanas parole"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā."
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Noklusējuma krātuve"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Neierobežota"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Cits"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Lietotājvārds"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Krātuve"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "iestatīt jaunu paroli"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Noklusējuma"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index be178e2356..90f2e4597e 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Kļūda"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Izvēlieties grupas"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Savienojuma tests ir veiksmīgs"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Savienojuma tests cieta neveiksmi"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Apstiprināt dzēšanu"
 
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr "Palīdzība"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -200,7 +200,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -268,7 +268,7 @@ msgstr "Lietotājiem un grupām bāzes DN var norādīt cilnē “Paplašināti
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -411,41 +411,51 @@ msgstr "Grupu meklēšanas atribūts"
 msgid "Group-Member association"
 msgstr "Grupu piederības asociācija"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Īpašie atribūti"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kvotu lauks"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Kvotas noklusējums"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "baitos"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "E-pasta lauks"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Lietotāja mājas mapes nosaukšanas kārtula"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 25feb2f8a9..9f3faff144 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,19 +39,6 @@ msgstr "Ислкучен е модот за одржување"
 msgid "Updated database"
 msgstr "Базата е надградена"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Кешот е надграден"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Не е доставена фотографија или датотека"
@@ -73,135 +59,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Недела"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Понеделник"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Среда"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Четврток"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Петок"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Сабота"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Јануари"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Февруари"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Април"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Мај"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Јуни"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Јули"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Септември"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Октомври"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Ноември"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Декември"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Подесувања"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Снимам..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "пред секунди"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "денеска"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "минатиот месец"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "пред месеци"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "минатата година"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "пред години"
 
@@ -269,6 +259,26 @@ msgstr "({count} одбраните)"
 msgid "Error loading file exists template"
 msgstr "Грешка при вчитување на датотеката, шаблонот постои "
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Споделен"
@@ -277,12 +287,12 @@ msgstr "Споделен"
 msgid "Share"
 msgstr "Сподели"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Грешка при споделување"
 
@@ -294,123 +304,123 @@ msgstr "Грешка при прекин на споделување"
 msgid "Error while changing permissions"
 msgstr "Грешка при промена на привилегии"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Споделено со Вас и групата {group} од {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Споделено со Вас од {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Сподели ја врската"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Заштити со лозинка"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Лозинка"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Дозволи јавен аплоуд"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Прати врска по е-пошта на личност"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Прати"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Постави рок на траење"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Рок на траење"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Сподели по е-пошта:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Не се најдени луѓе"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "група"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Повторно споделување не е дозволено"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Споделено во {item} со {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Не споделувај"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "извести преку електронска пошта"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "може да се измени"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "контрола на пристап"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "креирај"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "ажурирај"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "избриши"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "сподели"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Заштитено со лозинка"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Грешка при тргање на рокот на траење"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Грешка при поставување на рок на траење"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Праќање..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Е-порака пратена"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Предупредување"
 
@@ -457,11 +467,17 @@ msgstr "Надградбата беше неуспешна. Ве молиме п
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s ресетирање на лозинката"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}"
@@ -481,8 +497,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Корисничко име"
 
@@ -518,6 +534,18 @@ msgstr "Нова лозинка"
 msgid "Reset password"
 msgstr "Ресетирај лозинка"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Лично"
@@ -526,7 +554,7 @@ msgstr "Лично"
 msgid "Users"
 msgstr "Корисници"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Аппликации"
 
@@ -636,49 +664,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направете <strong>администраторска сметка</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Напредно"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Фолдер со податоци"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Конфигурирај ја базата"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "ќе биде користено"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Корисник на база"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Лозинка на база"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Име на база"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Табела во базата на податоци"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Сервер со база"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Завршувам ..."
 
@@ -694,7 +720,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Одјава"
 
@@ -720,27 +746,27 @@ msgstr "Автентификацијата на серверската стра
 msgid "Please contact your administrator."
 msgstr "Ве молиме контактирајте го вашиот администратор."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Ја заборавивте лозинката?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "запамти"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Најава"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Алтернативни најавувања"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 07ce185268..7f907ff611 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,283 +18,290 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Не можам да го преместам %s - Датотека со такво име веќе постои"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Не можам да ги префрлам %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Името на датотеката не може да биде празно."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Не е валиден извор"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Грешка додека преземам %s to %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Грешка при креирање на датотека"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Името на папката не може да биде празно."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Името на папката не смее да содржи \"/\". Одберете друго име."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Грешка при креирање на папка"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Не може да се постави папката за префрлање на податоци."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Грешен токен"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниту еден фајл не се вчита. Непозната грешка"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Датотеката беше успешно подигната."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотеката беше само делумно подигната."
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Не беше подигната датотека."
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Недостасува привремена папка"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Неуспеав да запишам на диск"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Нема доволно слободен сториџ"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Префрлањето е неуспешно. Не можам да го најдам префрлената датотека."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Погрешна папка."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Датотеки"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Немате доволно дисков простор"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Не можам да добијам резултат од серверот."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL-то не може да биде празно"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Во домашната папка, 'Shared' е резервирано има на датотека/папка"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} веќе постои"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Не множам да креирам датотека"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Не можам да креирам папка"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Сподели"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Трајно избришани"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Преименувај"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Чека"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Не можам да ја преименувам датотеката"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменета {new_name} со {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "врати"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} и {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' е грешно име за датотека."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Вашиот сториџ е скоро полн ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Вашето преземање се подготвува. Ова може да потрае до колку датотеките се големи."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Грешка при префрлање на датотека"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Променето"
 
@@ -302,12 +309,12 @@ msgstr "Променето"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s не може да биде преименуван"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Подигни"
 
@@ -343,72 +350,68 @@ msgstr "Максимална големина за внес на ZIP датот
 msgid "Save"
 msgstr "Сними"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Ново"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Текстуална датотека"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Папка"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Од врска"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Избришани датотеки"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Откажи прикачување"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Тука нема ништо. Снимете нешто!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Фајлот кој се вчитува е преголем"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Се скенираат датотеки, ве молам почекајте."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Моментално скенирам"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Го надградувам кешот на фјал системот..."
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index d168c2f594..30acd200ab 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,18 +81,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Барања кои недостасуваат."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -100,9 +100,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Снимам..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 988ed38ebe..42a953da79 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Пристапот е дозволен"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Грешка при конфигурација на Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Дозволи пристап"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Ве молам доставите валиден Dropbox клуч и тајна лозинка."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Грешка при конфигурација на Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Внимание:</b> \"smbclient\" не е инсталиран. Не е можно монтирање на CIFS/SMB дискови. Замолете го Вашиот систем администратор да го инсталира."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Внимание:</b> Не е овозможена или инсталирани FTP подршка во PHP. Не е можно монтирање на FTP дискови. Замолете го Вашиот систем администратор да го инсталира."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Корисници"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Овозможи надворешни за корисници"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Дозволи им на корисниците да монтираат свои надворешни дискови"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL root сертификати"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Увези"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index a6836f8836..3249f896d6 100644
--- a/l10n/mk/files_sharing.po
+++ b/l10n/mk/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Споделени од {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s ја сподели папката %s со Вас"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s ја сподели датотеката %s со Вас"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Преземи"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Подигни"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Откажи прикачување"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Нема достапно преглед за"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/mk/files_trashbin.po b/l10n/mk/files_trashbin.po
index 61301f454c..a4f653bfa9 100644
--- a/l10n/mk/files_trashbin.po
+++ b/l10n/mk/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: miroj <jmiroslav@softhome.net>\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Не можеше трајно да се избрише %s"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Не можеше да се поврати %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Избришани датотеки"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Грешка"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "повратени"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Тука нема ништо. Вашата корпа за отпадоци е празна!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Име"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Поврати"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Избришан"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Избриши"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Избришани датотеки"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 45cc5c02cb..fca0fe3c0d 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Помош"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Лично"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Подесувања"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Корисници"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Админ"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr "Непознат тип на датотека"
 msgid "Invalid image"
 msgstr "Невалидна фотографија"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Преземање во ZIP е исклучено"
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Апликацијата не е овозможена"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Грешка во автентикација"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Жетонот е истечен. Ве молам превчитајте ја страницата."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Датотеки"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Не можам да најдам категорија „%s“"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "пред секунди"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "денеска"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "вчера"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "минатиот месец"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "минатата година"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "пред години"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index e703aa4872..39b831e785 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Е-порака пратена"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Енкрипција"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Неможам да вчитам листа од App Store"
@@ -114,61 +156,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Вашата лозинка неможе да се смени"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Корисничка документација"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Надгради на {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Оневозможи"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Овозможи"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Ве молам почекајте ..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Грешка при исклучувањето на апликацијата"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Грешка при вклучувањето на апликацијата"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Надградувам ..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Грешка додека ја надградувам апликацијата"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Грешка"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Ажурирај"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Надграден"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Одбери фотографија за профилот"
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Снимам..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -182,40 +252,40 @@ msgstr "врати"
 msgid "Unable to remove user"
 msgstr "Не можам да го одстранам корисникот"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Администратор на група"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Избриши"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "додади група"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Мора да се обезбеди валидно корисничко име "
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Грешка при креирање на корисникот"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Мора да се обезбеди валидна лозинка"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ништо"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Најава"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Безбедносно предупредување"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Предупредување при подесување"
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Локалето не функционира"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Споделување"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Овозможи го API-то за споделување"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Дозволете апликациите да го користат API-то за споделување"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Дозволи врски"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Дозволи јавен аплоуд"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Овозможи повторно споделување"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Овозможи корисниците да споделуваат со секого"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Овозможи корисниците да споделуваат со корисници од своите групи"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Овозможи известување по електронска пошта"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Овозможи корисник да испраќа известување по електронска пошта за споделени датотеки"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Безбедност"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Наметни HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Адреса на сервер"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Порта"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Ниво на логирање"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Повеќе"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Помалку"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +604,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Додадете ја Вашата апликација"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Повеќе аппликации"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Избери аппликација"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Види ја страницата со апликации на apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Корисничка документација"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Администраторска документација"
@@ -507,7 +665,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Лозинка"
 
@@ -519,151 +677,149 @@ msgstr "Вашата лозинка беше променета."
 msgid "Unable to change your password"
 msgstr "Вашата лозинка неможе да се смени"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Моментална лозинка"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Смени лозинка"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Вашата адреса за е-пошта"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Фотографија за профил"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Префрли нова"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Одбери нова од датотеките"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Отстрани ја фотографијата"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Мора де биде png или jpg. Идеално квадрат, но ќе бидете во можност да ја исечете."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Прекини"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Откажи"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Одбери фотографија за профилот"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Јазик"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Помогни во преводот"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Енкрипција"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Лозинка за најавување"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Дешифрирај ги сите датотеки"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Име за најава"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Создај"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Предефинирано складиште "
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Неограничено"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Останато"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Корисничко име"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Складиште"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "постави нова лозинка"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Предефиниран"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index f7687a00d8..9fbc64a840 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +87,43 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Тестот за поврзување е успешен"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Тестот за поврзување не е успешен"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Потврдете го бришењето"
 
@@ -141,11 +141,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -163,7 +163,7 @@ msgstr "Помош"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -199,7 +199,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -267,7 +267,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -410,41 +410,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,15 +470,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -479,19 +489,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -505,10 +515,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ml/core.po b/l10n/ml/core.po
new file mode 100644
index 0000000000..15de395bd8
--- /dev/null
+++ b/l10n/ml/core.po
@@ -0,0 +1,801 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:36
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:41
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:42
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:47
+msgid "January"
+msgstr ""
+
+#: js/config.php:48
+msgid "February"
+msgstr ""
+
+#: js/config.php:49
+msgid "March"
+msgstr ""
+
+#: js/config.php:50
+msgid "April"
+msgstr ""
+
+#: js/config.php:51
+msgid "May"
+msgstr ""
+
+#: js/config.php:52
+msgid "June"
+msgstr ""
+
+#: js/config.php:53
+msgid "July"
+msgstr ""
+
+#: js/config.php:54
+msgid "August"
+msgstr ""
+
+#: js/config.php:55
+msgid "September"
+msgstr ""
+
+#: js/config.php:56
+msgid "October"
+msgstr ""
+
+#: js/config.php:57
+msgid "November"
+msgstr ""
+
+#: js/config.php:58
+msgid "December"
+msgstr ""
+
+#: js/js.js:458
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:996
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:997
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:998
+msgid "today"
+msgstr ""
+
+#: js/js.js:999
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1000
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1001
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1002
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1003
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:1004
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1005
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:767
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:171
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:178
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:188
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:190
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:214
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:220
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:223
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: js/share.js:230
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:234
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:235
+msgid "Send"
+msgstr ""
+
+#: js/share.js:240
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:241
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:277
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:280
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:324 js/share.js:363
+msgid "group"
+msgstr ""
+
+#: js/share.js:335
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:379
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:401
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:409
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:412
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:414
+msgid "access control"
+msgstr ""
+
+#: js/share.js:417
+msgid "create"
+msgstr ""
+
+#: js/share.js:420
+msgid "update"
+msgstr ""
+
+#: js/share.js:423
+msgid "delete"
+msgstr ""
+
+#: js/share.js:426
+msgid "share"
+msgstr ""
+
+#: js/share.js:698
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:711
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:729
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:754
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:765
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:789
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:8
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:7
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation.  "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/ml/files.po b/l10n/ml/files.po
new file mode 100644
index 0000000000..219f522da5
--- /dev/null
+++ b/l10n/ml/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:57 js/files.js:98
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:62
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:96
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:101
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:155
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:21
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:65
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:67
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:74
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:77
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:78
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:79
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:80
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:81
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:99
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:156
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:383
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:475
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:562
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:566
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:568 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:634
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:650
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:700
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:121
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:134
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:138
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:142
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:379
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:610 js/files.js:654
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:610 js/files.js:654
+msgid "Error"
+msgstr ""
+
+#: js/files.js:672 templates/index.php:68
+msgid "Name"
+msgstr ""
+
+#: js/files.js:673 templates/index.php:80
+msgid "Size"
+msgstr ""
+
+#: js/files.js:674 templates/index.php:82
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
+msgstr ""
+
+#: lib/app.php:111
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:14 templates/index.php:23
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:6
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:13
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:17
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:52
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:74
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:85 templates/index.php:86
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:98
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:100
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:105
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:108
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/ml/files_encryption.po b/l10n/ml/files_encryption.po
new file mode 100644
index 0000000000..798e7fb2e3
--- /dev/null
+++ b/l10n/ml/files_encryption.po
@@ -0,0 +1,201 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:295
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:7
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:11
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:40
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:47
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:58
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:12
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:22
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:28
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:33
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:42
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:44
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:61
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/ml/files_external.po b/l10n/ml/files_external.po
new file mode 100644
index 0000000000..e134fd3224
--- /dev/null
+++ b/l10n/ml/files_external.po
@@ -0,0 +1,127 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:516
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:519
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:155 templates/settings.php:156
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:127
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:147
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:165
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/ml/files_sharing.po b/l10n/ml/files_sharing.po
new file mode 100644
index 0000000000..1c510a7f4d
--- /dev/null
+++ b/l10n/ml/files_sharing.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:17
+#, php-format
+msgid "shared by %s"
+msgstr ""
+
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:48
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/ml/files_trashbin.po b/l10n/ml/files_trashbin.po
new file mode 100644
index 0000000000..789bc95d80
--- /dev/null
+++ b/l10n/ml/files_trashbin.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:852 lib/trashbin.php:854
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:23 templates/index.php:25
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:31
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:34 templates/index.php:35
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:8
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/ml/files_versions.po b/l10n/ml/files_versions.po
new file mode 100644
index 0000000000..02bd134839
--- /dev/null
+++ b/l10n/ml/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-01-31 07:18+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:14
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:60
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:87
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:125
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:155
+msgid "Restore"
+msgstr ""
diff --git a/l10n/ml/lib.po b/l10n/ml/lib.po
new file mode 100644
index 0000000000..47b765276d
--- /dev/null
+++ b/l10n/ml/lib.po
@@ -0,0 +1,338 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:875
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:231
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:232
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:233 private/files.php:261
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:258
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:259
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:63 private/json.php:88
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:52
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: 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
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: 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
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:198
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:199
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:133
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:135
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:137
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:139
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:141
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:142
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:144
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:145
+msgid "years ago"
+msgstr ""
diff --git a/l10n/ml/settings.po b/l10n/ml/settings.po
new file mode 100644
index 0000000000..49290f8d79
--- /dev/null
+++ b/l10n/ml/settings.po
@@ -0,0 +1,824 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:54
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:246
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:49 personal.php:50
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
+
+#: 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 "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Setup Warning"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:90
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:104
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:118
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:123
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:127
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:143
+msgid "Internet connection not working"
+msgstr ""
+
+#: 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 "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:192
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:200
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:205
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:219
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:228
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:243
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:246
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:254
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:261
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:274
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:276
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:282
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:377
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:416 templates/personal.php:181
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:420 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\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:37
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:50
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:64 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:81
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:83
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:101
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:103
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:107
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:112
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:120 templates/personal.php:121
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:147
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:149
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:167
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:172
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/ml/user_ldap.po b/l10n/ml/user_ldap.po
new file mode 100644
index 0000000000..bb825706df
--- /dev/null
+++ b/l10n/ml/user_ldap.po
@@ -0,0 +1,523 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:838
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:847
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:856
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:873 js/settings.js:882
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:876 js/settings.js:885
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:879
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:906
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:913
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:922
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:923
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:79 lib/wizard.php:93
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:122
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:784 lib/wizard.php:796
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:963
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:14
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:52
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:53
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:54
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:56
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:57
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:60
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/ml/user_webdavauth.po b/l10n/ml/user_webdavauth.po
new file mode 100644
index 0000000000..964b853618
--- /dev/null
+++ b/l10n/ml/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-01-31 07:18+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ml_IN/core.po b/l10n/ml_IN/core.po
index 8c7b03b498..20f6eaa8db 100644
--- a/l10n/ml_IN/core.po
+++ b/l10n/ml_IN/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ml_IN/files.po b/l10n/ml_IN/files.po
index 03a9d3ef97..d8c2c527a1 100644
--- a/l10n/ml_IN/files.po
+++ b/l10n/ml_IN/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ml_IN/files_encryption.po b/l10n/ml_IN/files_encryption.po
index 18aa121c05..7d4bee7e4e 100644
--- a/l10n/ml_IN/files_encryption.po
+++ b/l10n/ml_IN/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/ml_IN/files_external.po b/l10n/ml_IN/files_external.po
index 1b638a2af4..289d650413 100644
--- a/l10n/ml_IN/files_external.po
+++ b/l10n/ml_IN/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-06 02:01+0200\n"
-"PO-Revision-Date: 2013-07-05 08:25+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ml_IN/files_sharing.po b/l10n/ml_IN/files_sharing.po
index e7d468e857..80de277fc2 100644
--- a/l10n/ml_IN/files_sharing.po
+++ b/l10n/ml_IN/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ml_IN/files_trashbin.po b/l10n/ml_IN/files_trashbin.po
index f75561f852..87bb8f5963 100644
--- a/l10n/ml_IN/files_trashbin.po
+++ b/l10n/ml_IN/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/ml_IN/lib.po b/l10n/ml_IN/lib.po
index a510bace28..21021fc720 100644
--- a/l10n/ml_IN/lib.po
+++ b/l10n/ml_IN/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ml_IN/settings.po b/l10n/ml_IN/settings.po
index 1858d2db23..5a9922292b 100644
--- a/l10n/ml_IN/settings.po
+++ b/l10n/ml_IN/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ml_IN/user_ldap.po b/l10n/ml_IN/user_ldap.po
index 7710c7ff54..7d109240d0 100644
--- a/l10n/ml_IN/user_ldap.po
+++ b/l10n/ml_IN/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/mn/core.po b/l10n/mn/core.po
new file mode 100644
index 0000000000..a9b5d68e76
--- /dev/null
+++ b/l10n/mn/core.po
@@ -0,0 +1,801 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:36
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:41
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:42
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:47
+msgid "January"
+msgstr ""
+
+#: js/config.php:48
+msgid "February"
+msgstr ""
+
+#: js/config.php:49
+msgid "March"
+msgstr ""
+
+#: js/config.php:50
+msgid "April"
+msgstr ""
+
+#: js/config.php:51
+msgid "May"
+msgstr ""
+
+#: js/config.php:52
+msgid "June"
+msgstr ""
+
+#: js/config.php:53
+msgid "July"
+msgstr ""
+
+#: js/config.php:54
+msgid "August"
+msgstr ""
+
+#: js/config.php:55
+msgid "September"
+msgstr ""
+
+#: js/config.php:56
+msgid "October"
+msgstr ""
+
+#: js/config.php:57
+msgid "November"
+msgstr ""
+
+#: js/config.php:58
+msgid "December"
+msgstr ""
+
+#: js/js.js:458
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:996
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:997
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:998
+msgid "today"
+msgstr ""
+
+#: js/js.js:999
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1000
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1001
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1002
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/js.js:1003
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:1004
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1005
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:767
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:171
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:178
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:188
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:190
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:214
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:220
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:223
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: js/share.js:230
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:234
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:235
+msgid "Send"
+msgstr ""
+
+#: js/share.js:240
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:241
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:277
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:280
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:324 js/share.js:363
+msgid "group"
+msgstr ""
+
+#: js/share.js:335
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:379
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:401
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:409
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:412
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:414
+msgid "access control"
+msgstr ""
+
+#: js/share.js:417
+msgid "create"
+msgstr ""
+
+#: js/share.js:420
+msgid "update"
+msgstr ""
+
+#: js/share.js:423
+msgid "delete"
+msgstr ""
+
+#: js/share.js:426
+msgid "share"
+msgstr ""
+
+#: js/share.js:698
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:711
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:729
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:754
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:765
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:789
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:8
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:7
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation.  "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/mn/files.po b/l10n/mn/files.po
new file mode 100644
index 0000000000..7a3e02d962
--- /dev/null
+++ b/l10n/mn/files.po
@@ -0,0 +1,416 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:57 js/files.js:98
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:62
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:96
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:101
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:155
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:21
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:65
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:67
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:74
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:77
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:78
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:79
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:80
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:81
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:99
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:156
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:383
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:475
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:562
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:566
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:568 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:634
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:650
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:700
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:121
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:134
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:138
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:142
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:379
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:610 js/files.js:654
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:610 js/files.js:654
+msgid "Error"
+msgstr ""
+
+#: js/files.js:672 templates/index.php:68
+msgid "Name"
+msgstr ""
+
+#: js/files.js:673 templates/index.php:80
+msgid "Size"
+msgstr ""
+
+#: js/files.js:674 templates/index.php:82
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
+msgstr ""
+
+#: lib/app.php:111
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:14 templates/index.php:23
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:6
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:13
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:17
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:52
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:74
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:85 templates/index.php:86
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:98
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:100
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:105
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:108
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/mn/files_encryption.po b/l10n/mn/files_encryption.po
new file mode 100644
index 0000000000..d9b203ee57
--- /dev/null
+++ b/l10n/mn/files_encryption.po
@@ -0,0 +1,201 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:295
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:7
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:11
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:40
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:47
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:58
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:12
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:22
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:28
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:33
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:42
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:44
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:61
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/mn/files_external.po b/l10n/mn/files_external.po
new file mode 100644
index 0000000000..8c157a63e2
--- /dev/null
+++ b/l10n/mn/files_external.po
@@ -0,0 +1,127 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:516
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:519
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:155 templates/settings.php:156
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:127
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:147
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:165
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/mn/files_sharing.po b/l10n/mn/files_sharing.po
new file mode 100644
index 0000000000..d7cf1613bb
--- /dev/null
+++ b/l10n/mn/files_sharing.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:17
+#, php-format
+msgid "shared by %s"
+msgstr ""
+
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:48
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/mn/files_trashbin.po b/l10n/mn/files_trashbin.po
new file mode 100644
index 0000000000..999826e02f
--- /dev/null
+++ b/l10n/mn/files_trashbin.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:852 lib/trashbin.php:854
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:23 templates/index.php:25
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:31
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:34 templates/index.php:35
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:8
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/mn/files_versions.po b/l10n/mn/files_versions.po
new file mode 100644
index 0000000000..2f99aee005
--- /dev/null
+++ b/l10n/mn/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-02-04 07:14+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:14
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:60
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:87
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:125
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:155
+msgid "Restore"
+msgstr ""
diff --git a/l10n/mn/lib.po b/l10n/mn/lib.po
new file mode 100644
index 0000000000..46cbf163ac
--- /dev/null
+++ b/l10n/mn/lib.po
@@ -0,0 +1,338 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:875
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:231
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:232
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:233 private/files.php:261
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:258
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:259
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:63 private/json.php:88
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:52
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: 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
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: 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
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:198
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:199
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:133
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:135
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:136
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:137
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:139
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:141
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:142
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: private/template/functions.php:144
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:145
+msgid "years ago"
+msgstr ""
diff --git a/l10n/mn/settings.po b/l10n/mn/settings.po
new file mode 100644
index 0000000000..f2b9550b98
--- /dev/null
+++ b/l10n/mn/settings.po
@@ -0,0 +1,824 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:54
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:246
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:49 personal.php:50
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
+
+#: 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 "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Setup Warning"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:90
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:104
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:118
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:123
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:127
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:143
+msgid "Internet connection not working"
+msgstr ""
+
+#: 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 "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:192
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:200
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:205
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:219
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:228
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:243
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:246
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:254
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:261
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:274
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:276
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:282
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:377
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:416 templates/personal.php:181
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:420 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\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:37
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:50
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:64 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:81
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:83
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:101
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:103
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:107
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:112
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:120 templates/personal.php:121
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:147
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:149
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:167
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:172
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/mn/user_ldap.po b/l10n/mn/user_ldap.po
new file mode 100644
index 0000000000..b5d1295fd9
--- /dev/null
+++ b/l10n/mn/user_ldap.po
@@ -0,0 +1,523 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+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"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:838
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:847
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:856
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:873 js/settings.js:882
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:876 js/settings.js:885
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:879
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:906
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:913
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:922
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:923
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:79 lib/wizard.php:93
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:122
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/wizard.php:784 lib/wizard.php:796
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:963
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:14
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:52
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:53
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:54
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:56
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:57
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:60
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/mn/user_webdavauth.po b/l10n/mn/user_webdavauth.po
new file mode 100644
index 0000000000..8b429ff599
--- /dev/null
+++ b/l10n/mn/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-02-04 07:14+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 4835578aba..6ddccd56f8 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,131 +58,135 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Ahad"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Isnin"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Khamis"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Jumaat"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mac"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mei"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Jun"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Julai"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Ogos"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Disember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Simpan..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -263,6 +253,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -271,12 +281,12 @@ msgstr ""
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Ralat"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -288,123 +298,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Kata laluan"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Amaran"
 
@@ -451,11 +461,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}"
@@ -475,8 +491,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nama pengguna"
 
@@ -512,6 +528,18 @@ msgstr "Kata laluan baru"
 msgid "Reset password"
 msgstr "Penetapan semula kata laluan"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Peribadi"
@@ -520,7 +548,7 @@ msgstr "Peribadi"
 msgid "Users"
 msgstr "Pengguna"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplikasi"
 
@@ -630,49 +658,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "buat <strong>akaun admin</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Maju"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Fail data"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Konfigurasi pangkalan data"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Nama pengguna pangkalan data"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Kata laluan pangkalan data"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nama pangkalan data"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Hos pangkalan data"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Setup selesai"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +714,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Log keluar"
 
@@ -714,27 +740,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Hilang kata laluan?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "ingat"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Log masuk"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 8186def0ca..ceca8d5e29 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,280 +17,287 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Tiada ralat berlaku, fail berjaya dimuatnaik"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail yang dimuatnaik tidak lengkap"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Tiada fail dimuatnaik"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Direktori sementara hilang"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Gagal untuk disimpan"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Fail-fail"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Kongsi"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Namakan"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Ralat"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Dimodifikasi"
 
@@ -298,12 +305,12 @@ msgstr "Dimodifikasi"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Muat naik"
 
@@ -339,72 +346,68 @@ msgstr "Saiz maksimum input untuk fail ZIP"
 msgid "Save"
 msgstr "Simpan"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Baru"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Fail teks"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Muatnaik terlalu besar"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Imbasan semasa"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 6ca187b4eb..9c79c66dd3 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Simpan..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index d6f983e74f..87cb8d0504 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Pengguna"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 6bf0ef7417..b0a17e9ba3 100644
--- a/l10n/ms_MY/files_sharing.po
+++ b/l10n/ms_MY/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Muat turun"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Muat naik"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Batal muat naik"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ms_MY/files_trashbin.po b/l10n/ms_MY/files_trashbin.po
index 3435deb106..93f473d699 100644
--- a/l10n/ms_MY/files_trashbin.po
+++ b/l10n/ms_MY/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Puretech <terjemah.puretech@gmail.com>\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Tidak dapat menghapuskan %s secara kekal"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Tidak dapat memulihkan %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Ralat"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "dipulihkan"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Tiada apa disini. Tong sampah anda kosong!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nama"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Pulihkan"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Dihapuskan"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Padam"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Fail Dihapus"
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 73ab323519..3987ff503e 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Bantuan"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Peribadi"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Tetapan"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Pengguna"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Ralat pengesahan"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Fail-fail"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,62 +267,68 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index cf43b411e4..e76e534f06 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Nyahaktif"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aktif"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Ralat"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Kemaskini"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Simpan..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Kumpulan"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Padam"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Log masuk"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Amaran keselamatan"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Alamat pelayan"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Tahap Log"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Lanjutan"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Tambah apps anda"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Pilih aplikasi"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman applikasi di apps.owncloud.com"
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Kata laluan"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr "Gagal mengubah kata laluan anda "
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Kata laluan semasa"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Kata laluan baru"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Ubah kata laluan"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Alamat emel anda"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Isi alamat emel anda untuk membolehkan pemulihan kata laluan"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Gambar profil"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Batal"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Bahasa"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Bantu terjemah"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "Log masuk"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Buat"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Lain"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nama pengguna"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 567a9d10bb..ffaf5f23ca 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Ralat"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr "Bantuan"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/my_MM/core.po b/l10n/my_MM/core.po
index 2b5a7020a4..822acd25a9 100644
--- a/l10n/my_MM/core.po
+++ b/l10n/my_MM/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,131 +58,135 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "ဇန်နဝါရီ"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "ဖေဖော်ဝါရီ"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "မတ်"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "ဧပြီ"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "မေ"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "ဇွန်"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "ဇူလိုင်"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "ဩဂုတ်"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "စက်တင်ဘာ"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "အောက်တိုဘာ"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "နိုဝင်ဘာ"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "ဒီဇင်ဘာ"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "စက္ကန့်အနည်းငယ်က"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "ယနေ့"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "မနေ့က"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "ပြီးခဲ့သောလ"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "မနှစ်က"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "နှစ် အရင်က"
 
@@ -263,6 +253,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -271,12 +281,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -288,123 +298,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "စကားဝှက်"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "သက်တမ်းကုန်ဆုံးမည့်ရက်"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "အီးမေးလ်ဖြင့်ဝေမျှမည် -"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "ပြင်ဆင်နိုင်"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "ဖန်တီးမည်"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "ဖျက်မည်"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "ဝေမျှမည်"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -451,11 +461,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -475,8 +491,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "သုံးစွဲသူအမည်"
 
@@ -512,6 +528,18 @@ msgstr "စကားဝှက်အသစ်"
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -520,7 +548,7 @@ msgstr ""
 msgid "Users"
 msgstr "သုံးစွဲသူ"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -630,49 +658,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "အဆင့်မြင့်"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "အချက်အလက်ဖိုလ်ဒါလ်"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Database သုံးစွဲသူ"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Database စကားဝှက်"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Database အမည်"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "တပ်ဆင်ခြင်းပြီးပါပြီ။"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +714,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -714,27 +740,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "သင်၏စကားဝှက်ပျောက်သွားပြီလား။"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "မှတ်မိစေသည်"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "ဝင်ရောက်ရန်"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/my_MM/files.po b/l10n/my_MM/files.po
index 09849cace9..f61e76675e 100644
--- a/l10n/my_MM/files.po
+++ b/l10n/my_MM/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,233 +76,228 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "ဖိုင်များ"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -298,12 +305,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -339,72 +346,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "ဒေါင်းလုတ်"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/my_MM/files_encryption.po b/l10n/my_MM/files_encryption.po
index 5a9f5aa5ca..ee2aba0405 100644
--- a/l10n/my_MM/files_encryption.po
+++ b/l10n/my_MM/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/my_MM/files_external.po b/l10n/my_MM/files_external.po
index 12ae346136..0d76912418 100644
--- a/l10n/my_MM/files_external.po
+++ b/l10n/my_MM/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "သုံးစွဲသူ"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/my_MM/files_sharing.po b/l10n/my_MM/files_sharing.po
index c4e553f89a..42a6c8a77b 100644
--- a/l10n/my_MM/files_sharing.po
+++ b/l10n/my_MM/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "ဒေါင်းလုတ်"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/my_MM/files_trashbin.po b/l10n/my_MM/files_trashbin.po
index dee62ffcf4..db27619e26 100644
--- a/l10n/my_MM/files_trashbin.po
+++ b/l10n/my_MM/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/my_MM/lib.po b/l10n/my_MM/lib.po
index 4f07303819..93cefaec22 100644
--- a/l10n/my_MM/lib.po
+++ b/l10n/my_MM/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "အကူအညီ"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "သုံးစွဲသူ"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "အက်ဒမင်"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်"
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "ခွင့်ပြုချက်မအောင်မြင်"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "ဖိုင်များ"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,62 +267,68 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "စက္ကန့်အနည်းငယ်က"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "ယနေ့"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "မနေ့က"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "ပြီးခဲ့သောလ"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "မနှစ်က"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "နှစ် အရင်က"
diff --git a/l10n/my_MM/settings.po b/l10n/my_MM/settings.po
index 7425d66c35..e40126e75a 100644
--- a/l10n/my_MM/settings.po
+++ b/l10n/my_MM/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "လုံခြုံရေးသတိပေးချက်"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "စကားဝှက်"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "စကားဝှက်အသစ်"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "ပယ်ဖျက်မည်"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "သုံးစွဲသူအမည်"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/my_MM/user_ldap.po b/l10n/my_MM/user_ldap.po
index b544104a5a..f168578c57 100644
--- a/l10n/my_MM/user_ldap.po
+++ b/l10n/my_MM/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr "အကူအညီ"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 0260c4f4c8..7eb62b952f 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # onionhead <brthomassen@gmail.com>, 2013
+# vidaren <news@vidartysse.net>, 2014
 # Stein-Aksel Basma <stabasm@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 07:10+0000\n"
-"Last-Translator: onionhead <brthomassen@gmail.com>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +20,30 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s delte »%s« med deg"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Klarte ikke å sende mail til følgende brukere: %s"
 
 #: ajax/update.php:11
 msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Slo på vedlikeholdsmodus"
 
 #: ajax/update.php:14
 msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Slo av vedlikeholdsmodus"
 
 #: ajax/update.php:17
 msgid "Updated database"
-msgstr ""
-
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
+msgstr "Oppdaterte databasen"
 
 #: avatar/controller.php:62
 msgid "No image or file provided"
-msgstr ""
+msgstr "Bilde eller fil ikke angitt"
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
@@ -68,141 +55,145 @@ msgstr "Ugyldig bilde"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen"
 
 #: avatar/controller.php:135
 msgid "No crop data provided"
-msgstr ""
+msgstr "Ingen beskjæringsinformasjon angitt"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Mandag"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Lagrer..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minutt siden"
 msgstr[1] "%n minutter siden"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time siden"
 msgstr[1] "%n timer siden"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dager siden"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n dag siden"
 msgstr[1] "%n dager siden"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
-msgstr "forrige år"
+msgstr "i fjor"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "år siden"
 
@@ -212,7 +203,7 @@ msgstr "Velg"
 
 #: js/oc-dialogs.js:146
 msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Feil ved lasting av filvelger-mal: {error}"
 
 #: js/oc-dialogs.js:172
 msgid "Yes"
@@ -228,27 +219,27 @@ msgstr "Ok"
 
 #: js/oc-dialogs.js:219
 msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Feil ved lasting av meldingsmal: {error}"
 
 #: js/oc-dialogs.js:347
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{count} filkonflikt"
+msgstr[1] "{count} filkonflikter"
 
 #: js/oc-dialogs.js:361
 msgid "One file conflict"
-msgstr ""
+msgstr "En filkonflikt"
 
 #: js/oc-dialogs.js:367
 msgid "Which files do you want to keep?"
-msgstr ""
+msgstr "Hvilke filer vil du beholde?"
 
 #: js/oc-dialogs.js:368
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr ""
+msgstr "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet."
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
@@ -260,14 +251,34 @@ msgstr "Fortsett"
 
 #: js/oc-dialogs.js:433 js/oc-dialogs.js:446
 msgid "(all selected)"
-msgstr ""
+msgstr "(alle valgt)"
 
 #: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "({count} selected)"
-msgstr ""
+msgstr "({count} valgt)"
 
 #: js/oc-dialogs.js:457
 msgid "Error loading file exists template"
+msgstr "Feil ved lasting av \"filen eksisterer\"-mal"
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
 msgstr ""
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
@@ -278,150 +289,150 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
 #: js/share.js:171
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Feil ved oppheving av deling"
 
 #: js/share.js:178
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Feil ved endring av tillatelser"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Delt med deg og gruppen {group} av {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Delt med deg av {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
-msgstr ""
+msgstr "Del med bruker eller gruppe …"
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
-msgstr ""
+msgstr "Del lenke"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
-msgstr ""
-
-#: js/share.js:233
-msgid "Email link to person"
-msgstr ""
+msgstr "Tillat Offentlig Opplasting"
 
 #: js/share.js:234
+msgid "Email link to person"
+msgstr "Email lenke til person"
+
+#: js/share.js:235
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Del på epost"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Ingen personer funnet"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Videredeling er ikke tillatt"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Delt i {item} med {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
-msgstr ""
+msgstr "Varsle på email"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "kan endre"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "opprett"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "del"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Feil ved nullstilling av utløpsdato"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utløpsdato"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Advarsel"
 
 #: js/tags.js:4
 msgid "The object type is not specified."
-msgstr ""
+msgstr "Objekttypen er ikke spesifisert."
 
 #: js/tags.js:13
 msgid "Enter new"
-msgstr ""
+msgstr "Oppgi ny"
 
 #: js/tags.js:27
 msgid "Delete"
@@ -433,34 +444,40 @@ msgstr "Legg til"
 
 #: js/tags.js:39
 msgid "Edit tags"
-msgstr ""
+msgstr "Rediger merkelapper"
 
 #: js/tags.js:57
 msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "Feil ved lasting av dialogmal: {error}"
 
 #: js/tags.js:261
 msgid "No tags selected for deletion."
-msgstr ""
+msgstr "Ingen merkelapper valgt for sletting."
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr ""
+msgstr "Vennligst last siden på nytt."
 
 #: js/update.js:17
 msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr ""
+msgstr "Oppdateringen mislyktes. Vennligst rapporter dette problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-fellesskapet</a>."
 
 #: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
+msgstr "Oppdateringen var vellykket. Du omdirigeres nå til ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
+msgstr "%s nullstilling av passord"
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -472,18 +489,18 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr ""
+msgstr "Lenken for nullstilling av passordet ditt er sendt til din email.<br>Hvis du ikke mottar den innen rimelig tid, sjekk spam- og søppelmappene i epost-programmet.<br>Hvis den ikke er der, kontakt din lokale administrator ."
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request failed!<br>Did you make sure your email/username was right?"
-msgstr ""
+msgstr "Anmodning feilet!<br>Forsikret du deg om at din email/brukernavn var korrekt?"
 
 #: lostpassword/templates/lostpassword.php:18
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du burde motta detaljer om å tilbakestille passordet ditt via epost."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Brukernavn"
 
@@ -493,15 +510,15 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er nullstilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Ja, jeg vil virkelig nullstille passordet mitt nå"
 
 #: lostpassword/templates/lostpassword.php:30
 msgid "Reset"
-msgstr ""
+msgstr "Nullstill"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -519,6 +536,18 @@ msgstr "Nytt passord"
 msgid "Reset password"
 msgstr "Tilbakestill passord"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personlig"
@@ -527,7 +556,7 @@ msgstr "Personlig"
 msgid "Users"
 msgstr "Brukere"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apper"
 
@@ -541,31 +570,31 @@ msgstr "Hjelp"
 
 #: tags/controller.php:22
 msgid "Error loading tags"
-msgstr ""
+msgstr "Feil ved lasting av merkelapper"
 
 #: tags/controller.php:48
 msgid "Tag already exists"
-msgstr ""
+msgstr "Merkelappen finnes allerede"
 
 #: tags/controller.php:64
 msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "Feil ved sletting av merkelapp(er)"
 
 #: tags/controller.php:75
 msgid "Error tagging"
-msgstr ""
+msgstr "Feil ved merking"
 
 #: tags/controller.php:86
 msgid "Error untagging"
-msgstr ""
+msgstr "Feil ved fjerning av merkelapp"
 
 #: tags/controller.php:97
 msgid "Error favoriting"
-msgstr ""
+msgstr "Feil ved favorittmerking"
 
 #: tags/controller.php:108
 msgid "Error unfavoriting"
-msgstr ""
+msgstr "Feil ved fjerning av favorittmerking"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -583,16 +612,16 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Hei der,\n\nbare informerer om at %s delte %s med deg.\nVis den: %s\n\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s."
-msgstr ""
+msgstr "Delingen vil opphøre %s."
 
 #: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
-msgstr ""
+msgstr "Ha det!"
 
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
@@ -601,85 +630,83 @@ msgstr "Sikkerhetsadvarsel"
 
 #: templates/installation.php:26
 msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
+msgstr "PHP-versjonen din er sårbar for NULL Byte attack (CVE-2006-7243)"
 
 #: templates/installation.php:27
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Vennligst oppdater PHP-installasjonen din for å bruke %s på en sikker måte."
 
 #: templates/installation.php:33
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Ingen sikker slumptallsgenerator er tilgjengelig. Vennligst aktiver PHP OpenSSL-utvidelsen."
 
 #: templates/installation.php:34
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "Uten en sikker slumptallsgenerator er det mulig at en angriper kan forutse passordnullstilling-tokens og ta over kontoen din."
 
 #: templates/installation.php:40
 msgid ""
 "Your data directory and files are probably accessible from the internet "
 "because the .htaccess file does not work."
-msgstr ""
+msgstr "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer."
 
 #: templates/installation.php:42
 #, php-format
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>."
 
 #: templates/installation.php:48
 msgid "Create an <strong>admin account</strong>"
 msgstr "opprett en <strong>administrator-konto</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avansert"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "vil bli brukt"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasebruker"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Database tabellområde"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Databasevert"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Ferdigstiller ..."
 
@@ -688,14 +715,14 @@ msgid ""
 "This application requires JavaScript to be enabled for correct operation.  "
 "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
 "JavaScript</a> and re-load this interface."
-msgstr ""
+msgstr "Denne applikasjonen trenger JavaScript for å fungere korrekt.  Vennligst <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiver JavaScript</a> og last dette grensesnittet på nytt."
 
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr ""
+msgstr "%s er tilgjengelig. Få mer informasjon om hvordan du kan oppdatere."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -715,52 +742,52 @@ msgstr "Vennligst skift passord for å gjøre kontoen din sikker igjen."
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
-msgstr ""
+msgstr "Autentisering feilet på serveren!"
 
 #: templates/login.php:18
 msgid "Please contact your administrator."
-msgstr ""
+msgstr "Vennligst kontakt administratoren din."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Mistet passordet ditt?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "husk"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Logg inn"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
-msgstr ""
+msgstr "Alternative innlogginger"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
-msgstr ""
+msgstr "Denne ownCloud-instansen er for øyeblikket i enbrukermodus."
 
 #: templates/singleuser.user.php:4
 msgid "This means only administrators can use the instance."
-msgstr ""
+msgstr "Dette betyr at kun administratorer kan bruke instansen."
 
 #: templates/singleuser.user.php:5 templates/update.user.php:5
 msgid ""
 "Contact your system administrator if this message persists or appeared "
 "unexpectedly."
-msgstr ""
+msgstr "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner."
 
 #: templates/singleuser.user.php:7 templates/update.user.php:6
 msgid "Thank you for your patience."
-msgstr ""
+msgstr "Takk for din tålmodighet."
 
 #: templates/update.admin.php:3
 #, php-format
@@ -770,8 +797,8 @@ msgstr "Oppdaterer ownCloud til versjon %s, dette kan ta en stund."
 #: templates/update.user.php:3
 msgid ""
 "This ownCloud instance is currently being updated, which may take a while."
-msgstr ""
+msgstr "Denne ownCloud-instansen oppdateres for øyeblikket, noe som kan ta litt tid."
 
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
-msgstr ""
+msgstr "Vennligst last denne siden på nytt om en liten stund for å fortsette å bruke ownCloud."
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index b0f0975c6b..d81379a26d 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Hans Nesse <>, 2013
+# vidaren <news@vidartysse.net>, 2014
 # TheLugal <thelugal@gmail.com>, 2013
 # Stein-Aksel Basma <stabasm@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,296 +21,303 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Kan ikke flytte %s - En fil med samme navn finnes allerede"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Kunne ikke flytte %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Filnavn kan ikke være tomt."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:63
 #, php-format
-msgid ""
-"The name %s is already used in the folder %s. Please choose a different "
-"name."
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:81
-msgid "Not a valid source"
-msgstr ""
-
-#: ajax/newfile.php:86
-msgid ""
-"Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
-
-#: ajax/newfile.php:103
-#, php-format
-msgid "Error while downloading %s to %s"
-msgstr ""
-
-#: ajax/newfile.php:140
-msgid "Error when creating the file"
-msgstr ""
-
-#: ajax/newfolder.php:21
-msgid "Folder name cannot be empty."
-msgstr ""
-
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
-msgid "Error when creating the folder"
-msgstr ""
-
-#: ajax/upload.php:18 ajax/upload.php:50
-msgid "Unable to set upload directory."
-msgstr "Kunne ikke sette opplastingskatalog."
-
-#: ajax/upload.php:27
-msgid "Invalid Token"
-msgstr "Ugyldig nøkkel"
-
-#: ajax/upload.php:64
-msgid "No file was uploaded. Unknown error"
-msgstr "Ingen filer ble lastet opp. Ukjent feil."
-
-#: ajax/upload.php:71
-msgid "There is no error, the file uploaded with success"
-msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
-
-#: ajax/upload.php:72
-msgid ""
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen."
-
-#: ajax/upload.php:74
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet."
-
-#: ajax/upload.php:75
-msgid "The uploaded file was only partially uploaded"
-msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
-
-#: ajax/upload.php:76
-msgid "No file was uploaded"
-msgstr "Ingen filer ble lastet opp"
-
-#: ajax/upload.php:77
-msgid "Missing a temporary folder"
-msgstr "Mangler midlertidig mappe"
-
-#: ajax/upload.php:78
-msgid "Failed to write to disk"
-msgstr "Klarte ikke å skrive til disk"
-
-#: ajax/upload.php:96
-msgid "Not enough storage available"
-msgstr "Ikke nok lagringsplass"
-
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
-msgid "Upload failed. Could not find uploaded file"
-msgstr ""
-
-#: ajax/upload.php:172
-msgid "Invalid directory."
-msgstr "Ugyldig katalog."
-
-#: appinfo/app.php:11
-msgid "Files"
-msgstr "Filer"
-
-#: js/file-upload.js:228
-msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Ikke nok lagringsplass"
-
-#: js/file-upload.js:306
-msgid "Upload cancelled."
-msgstr "Opplasting avbrutt."
-
-#: js/file-upload.js:344
-msgid "Could not get result from server."
-msgstr ""
-
-#: js/file-upload.js:436
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
-
-#: js/file-upload.js:523
-msgid "URL cannot be empty"
-msgstr ""
-
-#: js/file-upload.js:527 js/filelist.js:377
-msgid "In the home folder 'Shared' is a reserved filename"
-msgstr ""
-
-#: js/file-upload.js:529 js/filelist.js:379
-msgid "{new_name} already exists"
-msgstr "{new_name} finnes allerede"
-
-#: js/file-upload.js:595
-msgid "Could not create file"
-msgstr ""
-
-#: js/file-upload.js:611
-msgid "Could not create folder"
-msgstr ""
-
-#: js/file-upload.js:661
-msgid "Error fetching URL"
-msgstr ""
-
-#: js/fileactions.js:125
-msgid "Share"
-msgstr "Del"
-
-#: js/fileactions.js:137
-msgid "Delete permanently"
-msgstr "Slett permanent"
-
-#: js/fileactions.js:194
-msgid "Rename"
-msgstr "Gi nytt navn"
-
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
-msgid "Pending"
-msgstr "Ventende"
-
-#: js/filelist.js:405
-msgid "Could not rename file"
-msgstr ""
-
-#: js/filelist.js:539
-msgid "replaced {new_name} with {old_name}"
-msgstr "erstattet {new_name} med {old_name}"
-
-#: js/filelist.js:539
-msgid "undo"
-msgstr "angre"
-
-#: js/filelist.js:591
-msgid "Error deleting file."
-msgstr ""
-
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n mappe"
-msgstr[1] "%n mapper"
-
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n fil"
-msgstr[1] "%n filer"
-
-#: js/filelist.js:617
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:828 js/filelist.js:866
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
-msgstr[0] "Laster opp %n fil"
-msgstr[1] "Laster opp %n filer"
-
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' er et ugyldig filnavn."
-
-#: js/files.js:81
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt."
 
-#: js/files.js:93
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr "Navnet %s brukes allerede i mappen %s. Velg et annet navn."
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr "Ikke en gyldig kilde"
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr "Serveren har ikke lov til å åpne URL-er. Sjekk konfigurasjon av server"
+
+#: ajax/newfile.php:119
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr "Feil ved nedlasting av %s til %s"
+
+#: ajax/newfile.php:156
+msgid "Error when creating the file"
+msgstr "Feil ved oppretting av filen"
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr "Mappenavn kan ikke være tomt."
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr "Feil ved oppretting av mappen"
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr "Kunne ikke sette opplastingskatalog."
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr "Ugyldig nøkkel"
+
+#: ajax/upload.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr "Ingen filer ble lastet opp. Ukjent feil."
+
+#: ajax/upload.php:78
+msgid "There is no error, the file uploaded with success"
+msgstr "Pust ut, ingen feil. Filen ble lastet opp problemfritt"
+
+#: ajax/upload.php:79
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen."
+
+#: ajax/upload.php:81
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet."
+
+#: ajax/upload.php:82
+msgid "The uploaded file was only partially uploaded"
+msgstr "Filen du prøvde å laste opp ble kun delvis lastet opp"
+
+#: ajax/upload.php:83
+msgid "No file was uploaded"
+msgstr "Ingen filer ble lastet opp"
+
+#: ajax/upload.php:84
+msgid "Missing a temporary folder"
+msgstr "Mangler midlertidig mappe"
+
+#: ajax/upload.php:85
+msgid "Failed to write to disk"
+msgstr "Klarte ikke å skrive til disk"
+
+#: ajax/upload.php:103
+msgid "Not enough storage available"
+msgstr "Ikke nok lagringsplass"
+
+#: ajax/upload.php:160
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Opplasting feilet. Fant ikke opplastet fil."
+
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Opplasting feilet. Klarte ikke å finne informasjon om fil."
+
+#: ajax/upload.php:189
+msgid "Invalid directory."
+msgstr "Ugyldig katalog."
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr "Filer"
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes"
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
+msgid "Upload cancelled."
+msgstr "Opplasting avbrutt."
+
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr "Fikk ikke resultat fra serveren."
+
+#: js/file-upload.js:477
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
+
+#: js/file-upload.js:564
+msgid "URL cannot be empty"
+msgstr "URL kan ikke være tom"
+
+#: js/file-upload.js:568
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr "I hjemmemappen er 'Shared' et reservert filnavn"
+
+#: js/file-upload.js:570 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr "{new_name} finnes allerede"
+
+#: js/file-upload.js:636
+msgid "Could not create file"
+msgstr "Klarte ikke å opprette fil"
+
+#: js/file-upload.js:652
+msgid "Could not create folder"
+msgstr "Klarte ikke å opprette mappe"
+
+#: js/file-upload.js:702
+msgid "Error fetching URL"
+msgstr "Feil ved henting av URL"
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr "Del"
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr "Slett permanent"
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr "Gi nytt navn"
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr "Ventende"
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr "Klarte ikke å gi nytt navn til fil"
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr "erstattet {new_name} med {old_name}"
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr "angre"
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr "Feil ved sletting av fil."
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n mappe"
+msgstr[1] "%n mapper"
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n fil"
+msgstr[1] "%n filer"
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr "{dirs} og {files}"
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Laster opp %n fil"
+msgstr[1] "Laster opp %n filer"
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "App for kryptering er aktivert men nøklene dine er ikke satt opp. Logg ut og logg inn igjen."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "Ugyldig privat nøkkel for Krypterings-app. Oppdater passordet for din private nøkkel i dine personlige innstillinger for å gjenopprette tilgang til de krypterte filene dine."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr ""
+msgstr "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Nedlastingen din klargjøres. Hvis filene er store kan dette ta litt tid."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
-msgstr ""
+msgstr "Feil ved flytting av fil"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Feil"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Endret"
 
 #: lib/app.php:60
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
-msgstr ""
+msgstr "Ulovlig mappenavn. Bruken av 'Shared' er reservert."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Kunne ikke gi nytt navn til %s"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Last opp"
 
@@ -345,72 +353,68 @@ msgstr "Maksimal størrelse på ZIP-filer"
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
-msgstr ""
+msgstr "Ny tekstfil"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Tekstfil"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
-msgstr "Slettet filer"
+msgstr "Slettede filer"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "Du har ikke tillatelse til å laste opp eller opprette filer her"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Filen er for stor"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prøver å laste opp er for store for å laste opp til denne serveren."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Skanner filer, vennligst vent."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Pågående skanning"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Oppgraderer filsystemets  mellomlager..."
diff --git a/l10n/nb_NO/files_encryption.po b/l10n/nb_NO/files_encryption.po
index 4db89c03c2..f56d81690b 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# vidaren <news@vidartysse.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,46 +20,46 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Gjenopprettingsnøkkel aktivert"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Klarte ikke å aktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen."
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Gjenopprettingsnøkkel ble deaktivert"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen."
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Passordet ble endret."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt."
 
 #: ajax/updatePrivateKeyPassword.php:52
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Passord for privat nøkkel ble oppdatert."
 
 #: ajax/updatePrivateKeyPassword.php:54
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Klarte ikke å oppdatere passord for privat nøkkel. Kanskje gammelt passord ikke var korrekt."
 
 #: files/error.php:12
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
 "during your session. Please try to log out and log back in to initialize the"
 " encryption app."
-msgstr ""
+msgstr "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen."
 
 #: files/error.php:16
 #, php-format
@@ -66,50 +67,50 @@ msgid ""
 "Your private key is not valid! Likely your password was changed outside of "
 "%s (e.g. your corporate directory). You can update your private key password"
 " in your personal settings to recover access to your encrypted files."
-msgstr ""
+msgstr "Din private nøkkel er ikke gyldig! Sannsynligvis ble passordet ditt endret utenfor %s. (f.eks. din bedriftskatalog). Du kan oppdatere passordet for din private nøkkel i dine personlige innstillinger for å gjenvinne tilgang til de krypterte filene dine."
 
 #: files/error.php:19
 msgid ""
 "Can not decrypt this file, probably this is a shared file. Please ask the "
 "file owner to reshare the file with you."
-msgstr ""
+msgstr "Kan ikke dekryptere denne filen. Dette er sannsynligvis en delt fil. Spør eieren av filen om å dele den med deg på nytt."
 
 #: files/error.php:22 files/error.php:27
 msgid ""
 "Unknown error please check your system settings or contact your "
 "administrator"
-msgstr ""
+msgstr "Ukjent feil. Sjekk systeminnstillingene dine eller kontakt administratoren"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
-msgstr ""
+msgstr "Manglende krav."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
-msgstr ""
+msgstr "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
-msgstr ""
+msgstr "Følgende brukere er ikke satt opp for kryptering:"
 
 #: js/detect-migration.js:21
 msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
+msgstr "Første gangs kryptering startet... Dette kan ta litt tid. Vennligst vent."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Lagrer..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
-msgstr ""
+msgstr "Gå direkte til din"
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
-msgstr ""
+msgstr "personlige innstillinger"
 
 #: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
@@ -118,84 +119,84 @@ msgstr "Kryptering"
 #: templates/settings-admin.php:7
 msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
+msgstr "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):"
 
 #: templates/settings-admin.php:11
 msgid "Recovery key password"
-msgstr ""
+msgstr "Passord for gjenopprettingsnøkkel"
 
 #: templates/settings-admin.php:14
 msgid "Repeat Recovery key password"
-msgstr ""
+msgstr "Gjenta passord for gjenopprettingsnøkkel"
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
-msgstr ""
+msgstr "Aktiv"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
-msgstr ""
+msgstr "Inaktiv"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
-msgstr ""
+msgstr "Endre passord for gjenopprettingsnøkkel:"
 
 #: templates/settings-admin.php:40
 msgid "Old Recovery key password"
-msgstr ""
+msgstr "Gammelt passord for gjenopprettingsnøkkel"
 
 #: templates/settings-admin.php:47
 msgid "New Recovery key password"
-msgstr ""
+msgstr "Nytt passord for gjenopprettingsnøkkel"
 
 #: templates/settings-admin.php:53
 msgid "Repeat New Recovery key password"
-msgstr ""
+msgstr "Gjenta nytt passord for gjenopprettingsnøkkel"
 
 #: templates/settings-admin.php:58
 msgid "Change Password"
-msgstr ""
+msgstr "Endre passord"
 
 #: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Ditt passord for privat nøkkel stemmer ikke med påloggingspassordet ditt lenger:"
 
 #: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord."
 
 #: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine."
 
 #: templates/settings-personal.php:22
 msgid "Old log-in password"
-msgstr ""
+msgstr "Gammelt påloggingspassord"
 
 #: templates/settings-personal.php:28
 msgid "Current log-in password"
-msgstr ""
+msgstr "Nåværende påloggingspassord"
 
 #: templates/settings-personal.php:33
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Oppdater passord for privat nøkkel"
 
 #: templates/settings-personal.php:42
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Aktiver gjenoppretting av passord:"
 
 #: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
 
 #: templates/settings-personal.php:60
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Innstillinger for gjenoppretting av filer ble oppdatert"
 
 #: templates/settings-personal.php:61
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Klarte ikke å oppdatere gjenoppretting av filer"
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 3e778cb6ab..91b4ca9391 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Hans Nesse <>\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Tilgang innvilget"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Feil ved konfigurering av Dropbox-lagring"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Gi tilgang"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Feil med konfigurering av Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Advarsel:</b> \"smbclient\" er ikke installert. Kan ikke montere CIFS/SMB mapper. Ta kontakt med din systemadministrator for å installere det."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Advarsel:</b> FTP støtte i PHP er ikke slått på eller innstallert. Kan ikke montere FTP mapper. Ta kontakt med din systemadministrator for å innstallere det."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Brukere"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Aktiver ekstern lagring for bruker"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Tillat brukere å koble til egne eksterne lagringsmedium"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL root-sertifikater"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importer root-sertifikat"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index cf4943e47f..6f1948eeb7 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# vidaren <news@vidartysse.net>, 2014
 # Stein-Aksel Basma <stabasm@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,9 +19,13 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Delt av {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
-msgstr ""
+msgstr "Denne delingen er passordbeskyttet"
 
 #: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
@@ -32,54 +37,38 @@ msgstr "Passord"
 
 #: templates/part.404.php:3
 msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
+msgstr "Beklager, denne lenken ser ikke ut til å virke lenger."
 
 #: templates/part.404.php:4
 msgid "Reasons might be:"
-msgstr ""
+msgstr "Mulige årsaker:"
 
 #: templates/part.404.php:6
 msgid "the item was removed"
-msgstr ""
+msgstr "elementet er fjernet"
 
 #: templates/part.404.php:7
 msgid "the link expired"
-msgstr ""
+msgstr "lenken er utløpt"
 
 #: templates/part.404.php:8
 msgid "sharing is disabled"
-msgstr ""
+msgstr "deling er deaktivert"
 
 #: templates/part.404.php:10
 msgid "For more info, please ask the person who sent this link."
+msgstr "For mer informasjon, spør personen som sendte lenken."
+
+#: templates/public.php:17
+#, php-format
+msgid "shared by %s"
+msgstr "delt av %s"
+
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:18
-#, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s delte mappen %s med deg"
-
-#: templates/public.php:21
-#, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s delte filen %s med deg"
-
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Last ned"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Last opp"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Avbryt opplasting"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Forhåndsvisning ikke tilgjengelig for"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
-msgstr ""
+msgstr "Direkte lenke"
diff --git a/l10n/nb_NO/files_trashbin.po b/l10n/nb_NO/files_trashbin.po
index 5bb60afa53..630f9d9f66 100644
--- a/l10n/nb_NO/files_trashbin.po
+++ b/l10n/nb_NO/files_trashbin.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Hans Nesse <>, 2013
+# vidaren <news@vidartysse.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +19,48 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kunne ikke slette %s fullstendig"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Kunne ikke gjenopprette %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Slettede filer"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Feil"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
-msgstr ""
+msgstr "gjenopprettet"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Ingenting her. Søppelkassen din er tom!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Navn"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Slettet"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
-msgstr "Slettet filer"
+msgstr "Slettede filer"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index b55d8702d8..52d99a921f 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# espenbye <espenbye@me.com>, 2014
+# vidaren <news@vidartysse.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-02-26 20:00+0000\n"
+"Last-Translator: vidaren <news@vidartysse.net>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,24 +22,24 @@ msgstr ""
 #: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Klarte ikke å tilbakeføre: %s"
 
-#: js/versions.js:7
+#: js/versions.js:14
 msgid "Versions"
 msgstr "Versjoner"
 
-#: js/versions.js:53
+#: js/versions.js:60
 msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Klarte ikke å tilbakeføre {file} til revisjon {timestamp}."
 
-#: js/versions.js:79
+#: js/versions.js:87
 msgid "More versions..."
-msgstr ""
+msgstr "Flere versjoner"
 
-#: js/versions.js:116
+#: js/versions.js:125
 msgid "No other versions available"
-msgstr ""
+msgstr "Det finnes ingen andre versjoner"
 
-#: js/versions.js:149
+#: js/versions.js:155
 msgid "Restore"
 msgstr "Gjenopprett"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 034978c5f1..cddd41ceea 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# espenbye <espenbye@me.com>, 2014
+# vidaren <news@vidartysse.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 07:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,41 +19,41 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
-msgstr ""
+msgstr "App \"%s\" kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
-msgstr ""
+msgstr "Intet app-navn spesifisert"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hjelp"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personlig"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Brukere"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "Klarte ikke å oppgradere \"%s\"."
 
 #: private/avatar.php:66
 msgid "Unknown filetype"
@@ -61,15 +63,10 @@ msgstr "Ukjent filtype"
 msgid "Invalid image"
 msgstr "Ugyldig bilde"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "web tjenester du kontrollerer"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP-nedlasting av avslått"
@@ -90,76 +87,80 @@ msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
-msgstr ""
+msgstr "Vennligst last ned filene separat i mindre deler eller spør administratoren pent."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
-msgstr ""
+msgstr "Ingen kilde spesifisert ved installering av app"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
-msgstr ""
+msgstr "Ingen href spesifisert ved installering av app fra http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
-msgstr ""
+msgstr "Ingen sti spesifisert ved installering av app fra lokal fil"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
-msgstr ""
+msgstr "Arkiver av type %s støttes ikke"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
-msgstr ""
+msgstr "Klarte ikke å åpne arkiv ved installering av app"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
-msgstr ""
+msgstr "App-en inneholder ikke filen info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
+msgstr "App kan ikke installeres på grunn av ulovlig kode i appen."
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
-msgstr ""
+msgstr "App kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
-msgstr ""
+msgstr "App kan ikke installeres fordi den inneholder tag <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
-msgstr ""
+msgstr "App kan ikke installeres fordi versjonen i info.xml/version ikke er den samme som versjonen som rapporteres fra app-butikken"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
-msgstr ""
+msgstr "App-mappe finnes allerede"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "Kan ikke opprette app-mappe.  Vennligst ordne opp i tillatelser. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Applikasjon er ikke påslått"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Autentikasjonsfeil"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Symbol utløpt. Vennligst last inn siden på nytt."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Filer"
@@ -175,31 +176,31 @@ msgstr "Bilder"
 #: private/setup/abstractdatabase.php:26
 #, php-format
 msgid "%s enter the database username."
-msgstr ""
+msgstr "%s legg inn brukernavn for databasen."
 
 #: private/setup/abstractdatabase.php:29
 #, php-format
 msgid "%s enter the database name."
-msgstr ""
+msgstr "%s legg inn navnet på databasen."
 
 #: private/setup/abstractdatabase.php:32
 #, php-format
 msgid "%s you may not use dots in the database name"
-msgstr ""
+msgstr "%s du kan ikke bruke punktum i databasenavnet"
 
 #: private/setup/mssql.php:20
 #, php-format
 msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
+msgstr "MS SQL-brukernavn og/eller passord ikke gyldig: %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
 msgid "You need to enter either an existing account or the administrator."
-msgstr ""
+msgstr "Du må legge inn enten en eksisterende konto eller administratoren."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -212,7 +213,7 @@ msgstr ""
 #: private/setup/postgresql.php:125 private/setup/postgresql.php:134
 #, php-format
 msgid "DB Error: \"%s\""
-msgstr ""
+msgstr "Databasefeil: \"%s\""
 
 #: private/setup/mysql.php:68 private/setup/oci.php:55
 #: private/setup/oci.php:122 private/setup/oci.php:145
@@ -223,111 +224,117 @@ msgstr ""
 #: private/setup/postgresql.php:126 private/setup/postgresql.php:135
 #, php-format
 msgid "Offending command was: \"%s\""
-msgstr ""
+msgstr "Kommandoen som feilet: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
-msgstr ""
+msgstr "Klarte ikke å etablere forbindelse til Oracle"
 
 #: private/setup/oci.php:41 private/setup/oci.php:113
 msgid "Oracle username and/or password not valid"
-msgstr ""
+msgstr "Oracle-brukernavn og/eller passord er ikke gyldig"
 
 #: private/setup/oci.php:170 private/setup/oci.php:202
 #, php-format
 msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
+msgstr "Kommando som feilet: \"%s\", navn: %s, passord: %s"
 
 #: private/setup/postgresql.php:23 private/setup/postgresql.php:69
 msgid "PostgreSQL username and/or password not valid"
-msgstr ""
+msgstr "PostgreSQL-brukernavn og/eller passord er ikke gyldig"
 
 #: private/setup.php:28
 msgid "Set an admin username."
-msgstr ""
+msgstr "Sett et admin-brukernavn."
 
 #: private/setup.php:31
 msgid "Set an admin password."
-msgstr ""
+msgstr "Sett et admin-passord."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s delte »%s« med deg"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kunne ikke finne kategori \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n minutter siden"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n timer siden"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "i dag"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "i går"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n dager siden"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "forrige måned"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n dager siden"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "forrige år"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "år siden"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 39604e80dc..a5cfd121e3 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# espenbye <espenbye@me.com>, 2014
 # Hans Nesse <>, 2013
+# vidaren <news@vidartysse.net>, 2014
 # Stein-Aksel Basma <stabasm@hotmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +21,48 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-post sendt"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Lasting av liste fra App Store feilet."
@@ -30,11 +74,11 @@ msgstr "Autentiseringsfeil"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
-msgstr ""
+msgstr "Ditt fulle navn er blitt endret."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change full name"
-msgstr ""
+msgstr "Klarte ikke å endre fullt navn"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -88,88 +132,116 @@ msgstr "Kunne ikke oppdatere app."
 
 #: changepassword/controller.php:20
 msgid "Wrong password"
-msgstr ""
+msgstr "Feil passord"
 
 #: changepassword/controller.php:42
 msgid "No user supplied"
-msgstr ""
+msgstr "Ingen bruker angitt"
 
 #: changepassword/controller.php:74
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
-msgstr ""
+msgstr "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt"
 
 #: changepassword/controller.php:79
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
-msgstr ""
+msgstr "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen."
 
 #: changepassword/controller.php:87
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
-msgstr ""
+msgstr "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket."
 
 #: changepassword/controller.php:92 changepassword/controller.php:103
 msgid "Unable to change password"
+msgstr "Kunne ikke endre passord"
+
+#: js/admin.js:73
+msgid "Sending..."
 msgstr ""
 
-#: js/apps.js:43
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Brukerdokumentasjon"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Oppdater til {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Slå avBehandle "
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aktiver"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Vennligst vent..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
-msgstr ""
+msgstr "Deaktivering av app feilet"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
-msgstr ""
+msgstr "Aktivering av app feilet"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Oppdaterer..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Feil ved oppdatering av app"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Feil"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Oppdater"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
+msgstr "Velg et profilbilde"
+
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:266
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
-
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Lagrer..."
+msgstr "Dekrypterer filer... Vennligst vent, dette kan ta litt tid."
 
 #: js/users.js:47
 msgid "deleted"
@@ -183,265 +255,349 @@ msgstr "angre"
 msgid "Unable to remove user"
 msgstr "Kunne ikke slette bruker"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Gruppeadministrator"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "legg til gruppe"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Oppgi et gyldig brukernavn"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Feil ved oppretting av bruker"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Oppgi et gyldig passord"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
-msgstr ""
+msgstr "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
 #: templates/admin.php:8
 msgid "Everything (fatal issues, errors, warnings, info, debug)"
-msgstr ""
+msgstr "Alt (fatale problemer, feil, advarsler, info, debug)"
 
 #: templates/admin.php:9
 msgid "Info, warnings, errors and fatal issues"
-msgstr ""
+msgstr "Info, advarsler, feil og fatale problemer"
 
 #: templates/admin.php:10
 msgid "Warnings, errors and fatal issues"
-msgstr ""
+msgstr "Advarsler, feil og fatale problemer"
 
 #: templates/admin.php:11
 msgid "Errors and fatal issues"
-msgstr ""
+msgstr "Feil og fatale problemer"
 
 #: templates/admin.php:12
 msgid "Fatal issues only"
+msgstr "Kun fatale problemer"
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ingen"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Logg inn"
+
+#: templates/admin.php:18
+msgid "Plain"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Sikkerhetsadvarsel"
 
-#: templates/admin.php:25
+#: 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 ""
+msgstr "Du aksesserer %s via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve bruk av HTTPS i stedet."
 
-#: templates/admin.php:39
+#: 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 "
 "configure your webserver in a way that the data directory is no longer "
 "accessible or you move the data directory outside the webserver document "
 "root."
-msgstr ""
+msgstr "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer. Vi anbefaler på det sterkeste at du konfigurerer web-serveren din slik at datamappen ikke lenger er tilgjengelig eller at du flytter datamappen ut av web-serverens dokument-rotmappe."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Installasjonsadvarsel"
 
-#: templates/admin.php:53
+#: 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 "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
-msgstr ""
+msgstr "Vennligst dobbeltsjekk <a href=\"%s\">installasjonsveilederne</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen 'fileinfo' mangler"
 
-#: templates/admin.php:68
+#: 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 "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
-msgstr ""
+msgstr "Din PHP-versjon er udatert"
 
-#: templates/admin.php:82
+#: 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 ""
+msgstr "PHP-versjonen din er utdatert. Vi anbefaler på det sterkeste at du oppdaterer til 5.3.8 eller nyere fordi eldre versjoner ikke vil virke. Det er mulig at denne installasjoner ikke fungerer korrekt."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Språk virker ikke"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
-msgstr ""
+msgstr "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
-msgstr ""
+msgstr "Dette betyr at det kan forekomme problemer med visse tegn i filnavn."
 
-#: templates/admin.php:106
+#: 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 ""
+msgstr "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Ingen internettilkopling"
 
-#: templates/admin.php:121
+#: 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 "
 "installation of 3rd party apps don´t work. Accessing files from remote and "
 "sending of notification emails might also not work. We suggest to enable "
 "internet connection for this server if you want to have all features."
-msgstr ""
+msgstr "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, slik som montering av ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Utfør en oppgave med hver side som blir lastet"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
-msgstr ""
+msgstr "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr ""
+msgstr "Bruk systemets cron-tjeneste for å kalle cron.php hvert 15. minutt."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktiver API for Deling"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Tillat apps å bruke API for Deling"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Tillat lenker"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
-msgstr "Tillat brukere å dele filer med lenker"
+msgstr "Tillat brukere å dele filer offentlig med lenker"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
-msgstr ""
+msgstr "Tillat offentlig opplasting"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
-msgstr ""
+msgstr "Tillat at brukere lar andre laste opp til deres offentlig delte mapper"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "TIllat videredeling"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Tillat brukere å dele med alle"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillat kun deling med andre brukere i samme gruppe"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
-msgstr ""
+msgstr "Tillat påminnelser i e-post"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "Tillat at brukere sender epost-påminnelser for delte filer"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Sikkerhet"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Tving HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
+msgstr "Tvinger klientene til å koble til %s via en kryptert forbindelse."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
+msgstr "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL."
+
+#: templates/admin.php:294
+msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Server-adresse"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Loggnivå"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versjon"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -451,30 +607,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Utviklet av<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud sammfunnet</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Legg til din App"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Flere Apps"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Velg en app"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikasjonens side på apps.owncloud.org"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Brukerdokumentasjon"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administratordokumentasjon"
@@ -508,7 +668,7 @@ msgstr "Vis \"Førstegangs veiveiseren\" på nytt"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passord"
 
@@ -520,151 +680,149 @@ msgstr "Passord har blitt endret"
 msgid "Unable to change your password"
 msgstr "Kunne ikke endre passordet ditt"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Nåværende passord"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Endre passord"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
-msgstr ""
+msgstr "Fullt navn"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Epost"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Din e-postadresse"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Oppi epostadressen du vil tilbakestille passordet for"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilbilde"
 
-#: templates/personal.php:91
-msgid "Upload new"
-msgstr ""
-
-#: templates/personal.php:93
-msgid "Select new from Files"
-msgstr ""
-
-#: templates/personal.php:94
-msgid "Remove image"
-msgstr ""
-
-#: templates/personal.php:95
-msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
-
-#: templates/personal.php:97
-msgid "Your avatar is provided by your original account."
-msgstr ""
-
 #: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+msgid "Upload new"
+msgstr "Last opp nytt"
 
-#: templates/personal.php:102
+#: templates/personal.php:103
+msgid "Select new from Files"
+msgstr "Velg nytt fra Filer"
+
+#: templates/personal.php:104
+msgid "Remove image"
+msgstr "Fjern bilde"
+
+#: templates/personal.php:105
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr "Enten png eller jpg. Helst kvadratisk men du kan beskjære det."
+
+#: templates/personal.php:107
+msgid "Your avatar is provided by your original account."
+msgstr "Avataren din kommer fra din opprinnelige konto."
+
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: templates/personal.php:112
 msgid "Choose as profile image"
-msgstr ""
+msgstr "Velg som profilbilde"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Bidra til oversettelsen"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
-msgstr ""
+msgstr "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Kryptering"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr ""
+msgstr "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
-msgstr ""
+msgstr "Innloggingspassord"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
-msgstr ""
+msgstr "Dekrypter alle filer"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Logginn navn"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Opprett"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
-msgstr ""
+msgstr "Administrativt gjenopprettingspassord"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
-msgstr ""
+msgstr "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Standard lager"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
-msgstr ""
+msgstr "Legg inn lagringskvote (f.eks. \"512 MB\" eller \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ubegrenset"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Annet"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Brukernavn"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Lager"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
-msgstr ""
+msgstr "endre fullt navn"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "sett nytt passord"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index ca55fe72a9..8de5b111cf 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# vidaren <news@vidartysse.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 07:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: ajax/clearMappings.php:34
 msgid "Failed to clear the mappings."
-msgstr ""
+msgstr "Klarte ikke å nullstille tilknytningene."
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
@@ -39,24 +40,24 @@ msgstr "Konfigurasjonen er i orden, men Bind mislyktes. Vennligst sjekk tjener-k
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
-msgstr ""
+msgstr "Konfigurasjonen er ikke gyldig. Sjekk loggene for flere detaljer."
 
 #: ajax/wizard.php:32
 msgid "No action specified"
-msgstr ""
+msgstr "Ingen handling spesifisert"
 
 #: ajax/wizard.php:38
 msgid "No configuration specified"
-msgstr ""
+msgstr "Ingen konfigurasjon spesifisert"
 
 #: ajax/wizard.php:81
 msgid "No data specified"
-msgstr ""
+msgstr "Ingen data spesifisert"
 
 #: ajax/wizard.php:89
 #, php-format
 msgid " Could not set configuration %s"
-msgstr ""
+msgstr "Klarte ikke å sette konfigurasjon %s"
 
 #: js/settings.js:67
 msgid "Deletion failed"
@@ -76,7 +77,7 @@ msgstr "Kan ikke legge til tjener-konfigurasjon"
 
 #: js/settings.js:127
 msgid "mappings cleared"
-msgstr ""
+msgstr "tilknytninger nullstilt"
 
 #: js/settings.js:128
 msgid "Success"
@@ -86,43 +87,43 @@ msgstr "Suksess"
 msgid "Error"
 msgstr "Feil"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
-msgstr ""
+msgstr "Konfigurasjon OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
-msgstr ""
+msgstr "Konfigurasjon feil"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
-msgstr ""
+msgstr "Konfigurasjon ufullstendig"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Velg grupper"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
-msgstr ""
+msgstr "Velg objektklasser"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
-msgstr ""
+msgstr "Velg attributter"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Tilkoblingstest lyktes"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Tilkoblingstest mislyktes"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Bekreft sletting"
 
@@ -130,23 +131,23 @@ msgstr "Bekreft sletting"
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s gruppe funnet"
+msgstr[1] "%s grupper funnet"
 
 #: lib/wizard.php:122
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s bruker funnet"
+msgstr[1] "%s brukere funnet"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
-msgstr ""
+msgstr "Ugyldig tjener"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
-msgstr ""
+msgstr "Fant ikke den ønskede funksjonaliteten"
 
 #: templates/part.settingcontrols.php:2
 msgid "Save"
@@ -154,7 +155,7 @@ msgstr "Lagre"
 
 #: templates/part.settingcontrols.php:4
 msgid "Test Configuration"
-msgstr ""
+msgstr "Test konfigurasjonen"
 
 #: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
 msgid "Help"
@@ -162,63 +163,63 @@ msgstr "Hjelp"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
 msgid "only those object classes:"
-msgstr ""
+msgstr "kun de objektklassene:"
 
 #: templates/part.wizard-groupfilter.php:17
 #: templates/part.wizard-userfilter.php:17
 msgid "only from those groups:"
-msgstr ""
+msgstr "kun fra de gruppene:"
 
 #: templates/part.wizard-groupfilter.php:25
 #: templates/part.wizard-loginfilter.php:32
 #: templates/part.wizard-userfilter.php:25
 msgid "Edit raw filter instead"
-msgstr ""
+msgstr "Rediger ubearbeidet filter i stedet"
 
 #: templates/part.wizard-groupfilter.php:30
 #: templates/part.wizard-loginfilter.php:37
 #: templates/part.wizard-userfilter.php:30
 msgid "Raw LDAP filter"
-msgstr ""
+msgstr "Ubearbeidet LDAP-filter"
 
 #: templates/part.wizard-groupfilter.php:31
 #, php-format
 msgid ""
 "The filter specifies which LDAP groups shall have access to the %s instance."
-msgstr ""
+msgstr "Filteret spesifiserer hvilke LDAP-grupper som skal ha tilgang til %s-instansen."
 
 #: templates/part.wizard-groupfilter.php:38
 msgid "groups found"
-msgstr ""
+msgstr "grupper funnet"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
-msgstr ""
+msgstr "LDAP-brukernavn:"
 
 #: templates/part.wizard-loginfilter.php:16
 msgid "LDAP Email Address:"
-msgstr ""
+msgstr "LDAP-epostadresse:"
 
 #: templates/part.wizard-loginfilter.php:24
 msgid "Other Attributes:"
-msgstr ""
+msgstr "Andre attributter:"
 
 #: templates/part.wizard-loginfilter.php:38
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Definerer filteret som skal brukes når innlogging forsøkes. %%uid erstatter brukernavnet i innloggingshandlingen. Eksempel: \"uid=%%uid\""
 
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
@@ -266,18 +267,18 @@ msgstr "Du kan spesifisere Base DN for brukere og grupper under Avansert fanen"
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
 msgid ""
 "The filter specifies which LDAP users shall have access to the %s instance."
-msgstr ""
+msgstr "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen."
 
 #: templates/part.wizard-userfilter.php:38
 msgid "users found"
-msgstr ""
+msgstr "brukere funnet"
 
 #: templates/part.wizardcontrols.php:5
 msgid "Back"
@@ -292,7 +293,7 @@ msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
 " experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr ""
+msgstr "<b>Advarsel:</b> Appene user_ldap og user_webdavauth er ikke kompatible med hverandre. Uventet oppførsel kan forekomme. Be systemadministratoren om å deaktivere en av dem."
 
 #: templates/settings.php:14
 msgid ""
@@ -302,7 +303,7 @@ msgstr "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke
 
 #: templates/settings.php:20
 msgid "Connection Settings"
-msgstr ""
+msgstr "Innstillinger for tilkobling"
 
 #: templates/settings.php:22
 msgid "Configuration Active"
@@ -320,19 +321,19 @@ msgstr "Sikkerhetskopierings (Replica) vert"
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
-msgstr ""
+msgstr "Oppgi en valgfri reservetjener. Den må være en replika av hovedtjeneren for LDAP/AD."
 
 #: templates/settings.php:24
 msgid "Backup (Replica) Port"
-msgstr ""
+msgstr "Reserve (Replika) Port"
 
 #: templates/settings.php:25
 msgid "Disable Main Server"
-msgstr ""
+msgstr "Deaktiver hovedtjeneren"
 
 #: templates/settings.php:25
 msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Koble til bare replika-tjeneren."
 
 #: templates/settings.php:26
 msgid "Case insensitve LDAP server (Windows)"
@@ -347,11 +348,11 @@ msgstr "Slå av SSL-sertifikat validering"
 msgid ""
 "Not recommended, use it for testing only! If connection only works with this"
 " option, import the LDAP server's SSL certificate in your %s server."
-msgstr ""
+msgstr "Ikke anbefalt, bruk kun for testing! Hvis tilkobling bare virker med dette valget, importer LDAP-tjenerens SSL-sertifikat i %s-serveren din."
 
 #: templates/settings.php:28
 msgid "Cache Time-To-Live"
-msgstr ""
+msgstr "Levetid i mellomlager"
 
 #: templates/settings.php:28
 msgid "in seconds. A change empties the cache."
@@ -359,7 +360,7 @@ msgstr "i sekunder. En endring tømmer bufferen."
 
 #: templates/settings.php:30
 msgid "Directory Settings"
-msgstr ""
+msgstr "Innstillinger for Katalog"
 
 #: templates/settings.php:32
 msgid "User Display Name Field"
@@ -367,7 +368,7 @@ msgstr "Vis brukerens navnfelt"
 
 #: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "LDAP-attributten som skal brukes til å generere brukerens visningsnavn."
 
 #: templates/settings.php:33
 msgid "Base User Tree"
@@ -379,11 +380,11 @@ msgstr "En Bruker Base DN pr. linje"
 
 #: templates/settings.php:34
 msgid "User Search Attributes"
-msgstr ""
+msgstr "Attributter for brukersøk"
 
 #: templates/settings.php:34 templates/settings.php:37
 msgid "Optional; one attribute per line"
-msgstr ""
+msgstr "Valgfritt, en attributt pr. linje"
 
 #: templates/settings.php:35
 msgid "Group Display Name Field"
@@ -391,7 +392,7 @@ msgstr "Vis gruppens navnfelt"
 
 #: templates/settings.php:35
 msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "LDAP-attributten som skal brukes til å generere gruppens visningsnavn."
 
 #: templates/settings.php:36
 msgid "Base Group Tree"
@@ -403,47 +404,57 @@ msgstr "En gruppe hoved-DN pr. linje"
 
 #: templates/settings.php:37
 msgid "Group Search Attributes"
-msgstr ""
+msgstr "Attributter for gruppesøk"
 
 #: templates/settings.php:38
 msgid "Group-Member association"
 msgstr "gruppe-medlem assosiasjon"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
-msgstr ""
+msgstr "Spesielle attributter"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
-msgstr ""
+msgstr "Felt med lagringskvote"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
-msgstr ""
+msgstr "Standard lagringskvote"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
-msgstr ""
+msgstr "Felt med e-postadresse"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
-msgstr ""
+msgstr "Navneregel for brukers hjemmemappe"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt."
 
-#: templates/settings.php:51
-msgid "Internal Username"
-msgstr ""
-
 #: templates/settings.php:52
+msgid "Internal Username"
+msgstr "Internt brukernavn"
+
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,17 +468,17 @@ msgid ""
 "behavior as before ownCloud 5 enter the user display name attribute in the "
 "following field. Leave it empty for default behavior. Changes will have "
 "effect only on newly mapped (added) LDAP users."
-msgstr ""
-
-#: templates/settings.php:53
-msgid "Internal Username Attribute:"
-msgstr ""
+msgstr "Som standard vil det interne brukernavnet bli laget utifra UUID-attributten. Dette sikrer at brukernavnet er unikt og at det ikke er nødvendig å konvertere tegn. Det interne brukernavnet har den begrensningen at bare disse tegnene er tillatt: [ a-zA-Z0-9_.@- ]. Andre tegn erstattes av tilsvarende ASCII-tegn eller blir ganske enkelt utelatt. Ved kollisjon blir et nummer lagt til / øket. Det interne brukernavnet brukes til å identifisere en bruker internt. Det er også standardnavnet på brukerens hjemmemappe. Det er også med i fjern-URL-er, for eksempel for alle *DAV-tjenester. Med denne innstillingen kan standard oppførsel overstyres. For å få en oppførsel som likner oppførselen før ownCloud 5, legg inn attributten for brukerens visningsnavn i dette feltet. La feltet stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere."
 
 #: templates/settings.php:54
-msgid "Override UUID detection"
-msgstr ""
+msgid "Internal Username Attribute:"
+msgstr "Attributt for internt brukernavn:"
 
 #: templates/settings.php:55
+msgid "Override UUID detection"
+msgstr "Overstyr UUID-oppdaging"
+
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,21 +487,21 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
-
-#: templates/settings.php:56
-msgid "UUID Attribute for Users:"
-msgstr ""
+msgstr "Som standard blir UUID-attributten oppdaget automatisk. UUID-attributten brukes til å identifisere LDAP-brukere og -grupper uten tvil. Det interne brukernavnet vil også bli laget basert på UUID, hvis ikke annet er spesifisert ovenfor. Du kan overstyre innstillingen og oppgi den attributten du ønsker. Du må forsikre det om at din valgte attributt kan hentes ut både for brukere og for grupper og at den er unik. La stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere og -grupper."
 
 #: templates/settings.php:57
-msgid "UUID Attribute for Groups:"
-msgstr ""
+msgid "UUID Attribute for Users:"
+msgstr "UUID-attributt for brukere:"
 
 #: templates/settings.php:58
-msgid "Username-LDAP User Mapping"
-msgstr ""
+msgid "UUID Attribute for Groups:"
+msgstr "UUID-attributt for grupper:"
 
 #: templates/settings.php:59
+msgid "Username-LDAP User Mapping"
+msgstr "Tilknytning av brukernavn til LDAP-bruker"
+
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,12 +513,12 @@ msgid ""
 " is not configuration sensitive, it affects all LDAP configurations! Never "
 "clear the mappings in a production environment, only in a testing or "
 "experimental stage."
-msgstr ""
+msgstr "Brukernavn brukes til å lagre og tilordne (meta)data. For at brukere skal identifiseres og gjenkjennes presist, vil hver LDAP-bruker ha et internt brukernavn. Dette krever en tilknytning fra brukernavn til LDAP-bruker. Brukernavn som opprettes blir knyttet til LDAP-brukerens UUID. I tillegg mellomlagres DN for å redusere LDAP-kommunikasjon, men det brukes ikke til identifisering. Hvis DN endres vil endringene bli oppdaget. Det interne brukernavnet brukes alle steder. Nullstilling av tilknytningene vil etterlate seg rester overalt. Nullstilling av tilknytningene skjer ikke pr. konfigurasjon, det påvirker alle LDAP-konfigurasjoner! Nullstill aldri tilknytningene i et produksjonsmiljø, kun ved testing eller eksperimentering."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
-msgstr ""
+msgstr "Nullstill tilknytning av brukernavn til LDAP-bruker"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
+msgstr "Nullstill tilknytning av gruppenavn til LDAP-gruppe"
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 8be4a5ee62..3524341ab8 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -5,13 +5,14 @@
 # Translators:
 # espenbye <espenbye@me.com>, 2013
 # espenbye <espenbye@me.com>, 2012
+# vidaren <news@vidartysse.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-25 19:18-0400\n"
-"PO-Revision-Date: 2013-08-24 14:10+0000\n"
-"Last-Translator: espenbye <espenbye@me.com>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-03-02 23:20+0000\n"
+"Last-Translator: vidaren <news@vidartysse.net>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "WebDAV Authentication"
-msgstr ""
+msgstr "WebDAV-autentisering"
 
 #: templates/settings.php:4
 msgid "Address: "
@@ -32,4 +33,4 @@ msgid ""
 "The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "Brukerens påloggingsinformasjon vil bli sendt til denne adressen. Denne utvidelsen sjekker svaret og vil tolke HTTP-statuskodene 401 og 403 som ugyldig bruker eller passord, og alle andre svar tolkes som gyldig påloggings."
diff --git a/l10n/nds/core.po b/l10n/nds/core.po
index 14b1f47bfb..648e46df30 100644
--- a/l10n/nds/core.po
+++ b/l10n/nds/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/nds/files.po b/l10n/nds/files.po
index 0923a19e99..3d928e1242 100644
--- a/l10n/nds/files.po
+++ b/l10n/nds/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/nds/files_encryption.po b/l10n/nds/files_encryption.po
index 868191ccce..defa439e7a 100644
--- a/l10n/nds/files_encryption.po
+++ b/l10n/nds/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/nds/files_external.po b/l10n/nds/files_external.po
index ed547a97cc..0cbcb8aaa1 100644
--- a/l10n/nds/files_external.po
+++ b/l10n/nds/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-24 10:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:453
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:457
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:460
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/nds/files_sharing.po b/l10n/nds/files_sharing.po
index 4b81b2ed05..9db95efcab 100644
--- a/l10n/nds/files_sharing.po
+++ b/l10n/nds/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-24 10:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/nds/files_trashbin.po b/l10n/nds/files_trashbin.po
index 3118b3b06d..2ec4379ecc 100644
--- a/l10n/nds/files_trashbin.po
+++ b/l10n/nds/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-27 02:28-0400\n"
-"PO-Revision-Date: 2013-10-24 10:48+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/nds/lib.po b/l10n/nds/lib.po
index 8fe55cbf50..f44dacaa1c 100644
--- a/l10n/nds/lib.po
+++ b/l10n/nds/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/nds/settings.po b/l10n/nds/settings.po
index a24c4c4aca..5224f83aa4 100644
--- a/l10n/nds/settings.po
+++ b/l10n/nds/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/nds/user_ldap.po b/l10n/nds/user_ldap.po
index 9bb61ef276..66bc16b25d 100644
--- a/l10n/nds/user_ldap.po
+++ b/l10n/nds/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ne/core.po b/l10n/ne/core.po
index 5fe329f3e9..0de88d8e9f 100644
--- a/l10n/ne/core.po
+++ b/l10n/ne/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ne/files.po b/l10n/ne/files.po
index 0d44c7750f..56d8f5dab4 100644
--- a/l10n/ne/files.po
+++ b/l10n/ne/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ne/files_encryption.po b/l10n/ne/files_encryption.po
index 334bc328e2..79efb4cb4b 100644
--- a/l10n/ne/files_encryption.po
+++ b/l10n/ne/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/ne/files_external.po b/l10n/ne/files_external.po
index 7e7ed0e396..f42bf8b71d 100644
--- a/l10n/ne/files_external.po
+++ b/l10n/ne/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ne/files_sharing.po b/l10n/ne/files_sharing.po
index 2d9ef07ffd..d363ca3ea7 100644
--- a/l10n/ne/files_sharing.po
+++ b/l10n/ne/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ne/files_trashbin.po b/l10n/ne/files_trashbin.po
index d733415ed4..b964888914 100644
--- a/l10n/ne/files_trashbin.po
+++ b/l10n/ne/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/ne/lib.po b/l10n/ne/lib.po
index bc3849b95d..92e6df5e03 100644
--- a/l10n/ne/lib.po
+++ b/l10n/ne/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ne/settings.po b/l10n/ne/settings.po
index e0f8135708..45cc088491 100644
--- a/l10n/ne/settings.po
+++ b/l10n/ne/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ne/user_ldap.po b/l10n/ne/user_ldap.po
index 90edbef2af..8d19c156bd 100644
--- a/l10n/ne/user_ldap.po
+++ b/l10n/ne/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 54f27a40f2..0177e68a32 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2013-2014
 # kwillems <kwillems@zonnet.nl>, 2013
 # Jorcee <mail@jordyc.nl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-23 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 06:50+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +20,11 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s deelde »%s« met jou"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "De vervaldatum ligt in het verleden."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Kon geen e-mail sturen aan de volgende gebruikers: %s"
@@ -42,19 +41,6 @@ msgstr "Onderhoudsmodus uitgeschakeld"
 msgid "Updated database"
 msgstr "Database bijgewerkt"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Bijwerken bestandscache. Dit kan even duren..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Bestandscache bijgewerkt"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% gereed ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Geen afbeelding of bestand opgegeven"
@@ -75,135 +61,139 @@ msgstr "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw"
 msgid "No crop data provided"
 msgstr "Geen bijsnijdingsgegevens opgegeven"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "zondag"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "maandag"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "dinsdag"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "woensdag"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "donderdag"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "vrijdag"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "zaterdag"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "januari"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "februari"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "maart"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "april"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "mei"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "augustus"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "september"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "november"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "december"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Opslaan"
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n minuten geleden"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n uur geleden"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n dagen geleden"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n maanden geleden"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "maanden geleden"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "jaar geleden"
 
@@ -271,6 +261,26 @@ msgstr "({count} geselecteerd)"
 msgid "Error loading file exists template"
 msgstr "Fout bij laden bestand bestaat al sjabloon"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Zeer zwak wachtwoord"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Zwak wachtwoord"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Matig wachtwoord"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Goed wachtwoord"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Sterk wachtwoord"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Gedeeld"
@@ -279,12 +289,12 @@ msgstr "Gedeeld"
 msgid "Share"
 msgstr "Delen"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fout"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fout tijdens het delen"
 
@@ -296,123 +306,123 @@ msgstr "Fout tijdens het stoppen met delen"
 msgid "Error while changing permissions"
 msgstr "Fout tijdens het veranderen van permissies"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Gedeeld met u en de groep {group} door {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Gedeeld met u door {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Delen met gebruiker of groep ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Deel link"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Sta publieke uploads toe"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "E-mail link naar persoon"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Versturen"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Stel vervaldatum in"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Deel via e-mail:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Geen mensen gevonden"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "groep"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Verder delen is niet toegestaan"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Gedeeld in {item} met {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "melden per e-mail"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "kan wijzigen"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "toegangscontrole"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "creëer"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "bijwerken"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "verwijderen"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Fout tijdens het verwijderen van de verval datum"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Versturen ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail verzonden"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -459,11 +469,17 @@ msgstr "De update is niet geslaagd. Meld dit probleem aan bij de <a href=\"https
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "De update is geslaagd. Je wordt teruggeleid naar je eigen ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s wachtwoord reset"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Er ontstond een probleem bij het versturen van het e-mailbericht, neem contact op met uw beheerder."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Gebruik de volgende link om je wachtwoord te resetten: {link}"
@@ -483,8 +499,8 @@ msgstr "Aanvraag mislukt!<br>Weet je zeker dat je gebruikersnaam en/of wachtwoor
 msgid "You will receive a link to reset your password via Email."
 msgstr "Je ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Gebruikersnaam"
 
@@ -520,6 +536,18 @@ msgstr "Nieuw wachtwoord"
 msgid "Reset password"
 msgstr "Reset wachtwoord"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Persoonlijk"
@@ -528,7 +556,7 @@ msgstr "Persoonlijk"
 msgid "Users"
 msgstr "Gebruikers"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -638,49 +666,47 @@ msgstr "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informa
 msgid "Create an <strong>admin account</strong>"
 msgstr "Maak een <strong>beheerdersaccount</strong> aan"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Geavanceerd"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Opslag & database"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Gegevensmap"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configureer de database"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "zal gebruikt worden"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Gebruiker database"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Wachtwoord database"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Naam database"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Database tablespace"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Databaseserver"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Afronden ..."
 
@@ -696,7 +722,7 @@ msgstr "Deze applicatie heeft een werkend JavaScript nodig.  <a href=\"http://en
 msgid "%s is available. Get more information on how to update."
 msgstr "%s is beschikbaar. Verkrijg meer informatie over het bijwerken."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Afmelden"
 
@@ -722,28 +748,28 @@ msgstr "Authenticatie bij de server mislukte!"
 msgid "Please contact your administrator."
 msgstr "Neem contact op met uw systeembeheerder."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Wachtwoord vergeten?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "onthoud gegevens"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Meld je aan"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternatieve inlogs"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hallo daar,<br><br>even een berichtje dat %s »%s« met u deelde.<br><a href=\"%s\">Bekijk hier!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Hallo daar,<br><br>we willen even laten weten dat %s <strong>%s</strong> met u heeft gedeeld.<br><a href=\"%s\">Bekijk het!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index bd5ede5659..d478170f83 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2013-2014
 # kwillems <kwillems@zonnet.nl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-24 01:55-0500\n"
-"PO-Revision-Date: 2013-12-23 08:30+0000\n"
-"Last-Translator: André Koot <meneer@tken.net>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,283 +19,290 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Kon %s niet verplaatsen"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Bestandsnaam kan niet leeg zijn."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "De bestandsnaam mag geen \"/\" bevatten. Kies een andere naam."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" is een ongeldige bestandsnaam."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "De doelmap is verplaatst of verwijderd."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "De naam %s bestaat al in map %s. Kies een andere naam."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Geen geldige bron"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Server mag geen URS's openen, controleer de server configuratie"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Fout bij downloaden %s naar %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Fout bij creëren bestand"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Mapnaam mag niet leeg zijn."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "De mapnaam mag geen \"/\" bevatten. Kies een andere naam."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Fout bij aanmaken map"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Kan upload map niet instellen."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Ongeldig Token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Er was geen bestand geladen.  Onbekende fout"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "De upload van het bestand is goedgegaan."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is gedeeltelijk geüpload"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Er is geen bestand geüpload"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Er ontbreekt een tijdelijke map"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Schrijven naar schijf mislukt"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Niet genoeg opslagruimte beschikbaar"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Upload mislukt, Kon geen bestandsinfo krijgen."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Upload mislukt. Kon ge-uploade bestand niet vinden"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Upload mislukt, Kon geen bestandsinfo krijgen."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Bestanden"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Niet genoeg ruimte beschikbaar"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Kon het resultaat van de server niet terugkrijgen."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL mag niet leeg zijn"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "in de home map 'Shared' is een gereserveerde bestandsnaam"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Kon bestand niet creëren"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Kon niet creëren map"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Fout bij ophalen URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Delen"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Verwijder definitief"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "In behandeling"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Kon niet hernoemen bestand"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "verving {new_name} met {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Fout bij verwijderen bestand."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] "%n mappen"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] "%n bestanden"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} en {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n bestand aan het uploaden"
 msgstr[1] "%n bestanden aan het uploaden"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' is een ongeldige bestandsnaam."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" is een ongeldige bestandsnaam."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Uw opslagruimte zit vol, Bestanden kunnen niet meer worden ge-upload of gesynchroniseerd!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Crypto app is geactiveerd, maar uw sleutels werden niet geïnitialiseerd. Log uit en log daarna opnieuw in."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ongeldige privésleutel voor crypto app. Werk het privésleutel wachtwoord bij in uw persoonlijke instellingen om opnieuw toegang te krijgen tot uw versleutelde bestanden."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Fout bij verplaatsen bestand"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Fout"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Grootte"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Aangepast"
 
@@ -303,12 +310,12 @@ msgstr "Aangepast"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Ongeldige mapnaam. Gebruik van 'Shared' is gereserveerd."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s kon niet worden hernoemd"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Uploaden"
 
@@ -344,72 +351,68 @@ msgstr "Maximale grootte voor ZIP bestanden"
 msgid "Save"
 msgstr "Bewaren"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nieuw"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Nieuw tekstbestand"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Tekstbestand"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Map"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Vanaf link"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Verwijderde bestanden"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "U hebt geen toestemming om hier te uploaden of bestanden te maken"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Downloaden"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Verwijder"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Upload is te groot"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Er wordt gescand"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Upgraden bestandssysteem cache..."
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index ed6bb180e8..0e0cf6cab7 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2013-2014
 # Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-11-30 19:00+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 18:11+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -82,18 +82,18 @@ msgid ""
 "administrator"
 msgstr "Onbekende fout, Controleer uw systeeminstellingen of neem contact op met uw systeembeheerder"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Missende benodigdheden."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "De volgende gebruikers hebben geen configuratie voor encryptie:"
 
@@ -101,9 +101,9 @@ msgstr "De volgende gebruikers hebben geen configuratie voor encryptie:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Opslaan"
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Initiële versleuteling bezig... Probeer het later opnieuw."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 539642335b..a273cdb38f 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 18:21+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Toegang toegestaan"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Fout tijdens het configureren van Dropbox opslag"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Sta toegang toe"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Geef een geldige Dropbox key en secret."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Fout tijdens het configureren van Google Drive opslag"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Bewaard"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Waarschuwing:</b> \"smbclient\" is niet geïnstalleerd. Mounten van CIFS/SMB shares is niet mogelijk. Vraag uw beheerder om smbclient te installeren."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Waarschuwing:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van FTP shares is niet mogelijk. Vraag uw beheerder FTP ondersteuning te installeren."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Gebruikers"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Verwijder"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Externe opslag voor gebruikers activeren"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Sta gebruikers toe om hun eigen externe opslag aan te koppelen"
+msgid "Allow users to mount the following external storage"
+msgstr "Sta gebruikers toe de volgende externe opslag aan te koppelen"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL root certificaten"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importeer root certificaat"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index ee7cf51429..e2bb03d4b8 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2013-2014
 # Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 18:21+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,10 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Gedeeld door {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Deze share is met een wachtwoord beveiligd"
@@ -55,32 +59,16 @@ msgstr "delen is uitgeschakeld"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s deelt de map %s met u"
+msgid "shared by %s"
+msgstr "gedeeld door %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s deelt het bestand %s met u"
+msgid "Download %s"
+msgstr "Download %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Downloaden"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Uploaden"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Upload afbreken"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Geen voorbeeldweergave beschikbaar voor"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Directe link"
diff --git a/l10n/nl/files_trashbin.po b/l10n/nl/files_trashbin.po
index cd643d87f3..58ac6f7097 100644
--- a/l10n/nl/files_trashbin.po
+++ b/l10n/nl/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kon %s niet permanent verwijderen"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Kon %s niet herstellen"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Verwijderde bestanden"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Fout"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "hersteld"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Niets te vinden. Uw prullenbak is leeg!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Naam"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Herstellen"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Verwijderd"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Verwijder"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Verwijderde bestanden"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 91ff5c3487..ac43d30ef8 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2013-2014
 # kwillems <kwillems@zonnet.nl>, 2013
 # Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 18:21+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,38 +20,38 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "App \"%s\" kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "De app naam is niet gespecificeerd."
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Help"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Instellingen"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Gebruikers"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Beheerder"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Upgrade \"%s\" mislukt."
@@ -64,15 +64,10 @@ msgstr "Onbekend bestandsformaat"
 msgid "Invalid image"
 msgstr "Ongeldige afbeelding"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Webdiensten in eigen beheer"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "Kon \"%s\" niet openen"
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP download is uitgeschakeld."
@@ -95,74 +90,78 @@ msgid ""
 "administrator."
 msgstr "Download de bestanden afzonderlijk in kleinere porties of vraag het uw beheerder,"
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Geen bron opgegeven bij installatie van de app"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Geen href opgegeven bij installeren van de app vanaf http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Geen pad opgegeven bij installeren van de app vanaf een lokaal bestand"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Archiefbestanden van type %s niet ondersteund"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Kon archiefbestand bij installatie van de app niet openen"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "De app heeft geen info.xml bestand"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "De app kan niet worden geïnstalleerd wegens onjuiste code in de app"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "De app kan niet worden geïnstalleerd omdat de versie in info.xml/version niet dezelfde is als de versie zoals die in de app store staat vermeld"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "App directory bestaat al"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Kan de app map niet aanmaken, Herstel de permissies. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "De applicatie is niet actief"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Authenticatie fout"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token verlopen.  Herlaad de pagina."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Onbekende gebruiker"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Bestanden"
@@ -202,8 +201,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Geef of een bestaand account op of het beheerdersaccount."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL gebruikersnaam en/of wachtwoord ongeldig"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "MySQL/MariaDB gebruikersnaam en/of wachtwoord ongeldig"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -230,21 +229,21 @@ msgstr "Onjuiste commande was: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL gebruiker '%s'@'localhost' bestaat al."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "MySQL/MariaDB gebruiker '%s'@'localhost' bestaat al."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Verwijder deze gebruiker uit MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Verwijder deze gebruiker uit MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL gebruiker '%s'@'%%' bestaat al"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "MySQL/MariaDB gebruiker '%s'@'%%' bestaat al"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Verwijder deze gebruiker uit MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Verwijder deze gebruiker uit MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -271,66 +270,72 @@ msgstr "Stel de gebruikersnaam van de beheerder in."
 msgid "Set an admin password."
 msgstr "Stel een beheerderswachtwoord in."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Controleer de <a href='%s'>installatiehandleiding</a> goed."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s deelde »%s« met jou"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kon categorie \"%s\" niet vinden"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuut geleden"
 msgstr[1] "%n minuten geleden"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n uur geleden"
 msgstr[1] "%n uur geleden"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "vandaag"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "gisteren"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag terug"
 msgstr[1] "%n dagen geleden"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "vorige maand"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n maand geleden"
 msgstr[1] "%n maanden geleden"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "vorig jaar"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "jaar geleden"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 7ad4e32806..8113608307 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2013-2014
 # helonaut, 2013
 # kwillems <kwillems@zonnet.nl>, 2013
 # Len <lenny@weijl.org>, 2013
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-06 07:40+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 19:01+0000\n"
 "Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,48 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Ongeldige waarde voor %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Bewaard"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "test e-mailinstellingen"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Als u dit e-mailbericht ontvangt, lijken de instellingen juist."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-mail verzonden"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "U moet uw e-mailadres instellen voordat u testberichten kunt versturen."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Verstuurmodus"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Versleuteling"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Authenticatiemethode"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Kan de lijst niet van de App store laden"
@@ -117,62 +159,90 @@ msgstr "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleute
 msgid "Unable to change password"
 msgstr "Kan wachtwoord niet wijzigen"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Versturen..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Gebruikersdocumentatie"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Beheerdocumentatie"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Bijwerken naar {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Activeer"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Even geduld aub...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Fout tijdens het uitzetten van het programma"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Fout tijdens het aanzetten van het programma"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Bijwerken...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Fout bij bijwerken app"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Fout"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Bijwerken"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Bijgewerkt"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Kies een profielafbeelding"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Zeer zwak wachtwoord"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Zwak wachtwoord"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Matig wachtwoord"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Goed wachtwoord"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Sterk wachtwoord"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Opslaan"
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "verwijderd"
@@ -185,40 +255,40 @@ msgstr "ongedaan maken"
 msgid "Unable to remove user"
 msgstr "Kon gebruiker niet verwijderen"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Groepen"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Groep beheerder"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Verwijder"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "toevoegen groep"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Er moet een geldige gebruikersnaam worden opgegeven"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Fout bij aanmaken gebruiker"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Er moet een geldig wachtwoord worden opgegeven"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Nederlands"
 
@@ -242,18 +312,42 @@ msgstr "Fouten en fatale problemen"
 msgid "Fatal issues only"
 msgstr "Alleen fatale problemen"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Geen"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Login"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Gewoon"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "NT LAN Manager"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Beveiligingswaarschuwing"
 
-#: templates/admin.php:25
+#: 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 "U bent met %s verbonden over HTTP. We adviseren met klem uw server zo te configureren dat allen HTTPS kan worden gebruikt."
 
-#: templates/admin.php:39
+#: 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 "
@@ -262,68 +356,68 @@ msgid ""
 "root."
 msgstr "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Instellingswaarschuwing"
 
-#: templates/admin.php:53
+#: 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 "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Conntroleer de <a href='%s'>installatie handleiding</a> goed."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Module 'fileinfo' ontbreekt"
 
-#: templates/admin.php:68
+#: 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 "De PHP module 'fileinfo' ontbreekt. We adviseren met klem om deze module te activeren om de beste resultaten te bereiken voor mime-type detectie."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Uw PHP versie is verouderd"
 
-#: templates/admin.php:82
+#: 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 "Uw PHP versie is verouderd. We adviseren met klem om bij te werken naar versie 5.3.8 of later, omdat oudere versies corrupt kunnen zijn. Het is mogelijk dat deze installatie niet goed werkt."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Taalbestand werkt niet"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "De systeemtaal kan niet worden ingesteld op een taal die UTF-8 ondersteunt."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Dat betekent dat er problemen kunnen optreden met bepaalde tekens in bestandsnamen."
 
-#: templates/admin.php:106
+#: 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 "We adviseren met klem om de noodzakelijke pakketten op uw systeem te installeren om een van de volgende talen te ondersteunen: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Internet verbinding werkt niet"
 
-#: templates/admin.php:121
+#: 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 "
@@ -332,118 +426,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Laatst uitgevoerde cron op %s."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron is nog niet uitgevoerd!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Bij laden van elke pagina één taak uitvoeren"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Delen"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activeren Share API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Apps toestaan de Share API te gebruiken"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Toestaan links"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Toestaan dat gebruikers objecten met links delen met anderen"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Sta publieke uploads toe"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Sta gebruikers toe anderen in hun publiek gedeelde mappen bestanden te uploaden"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Toestaan opnieuw delen"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Toestaan dat gebruikers objecten die anderen met hun gedeeld hebben zelf ook weer delen met anderen"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Toestaan dat gebruikers met iedereen delen"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Instellen dat gebruikers alleen met leden binnen hun groepen delen"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Toestaan e-mailnotificaties"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Sta gebruikers toe om e-mailnotificaties  te versturen voor gedeelde bestanden"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Beveiliging"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Afdwingen HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Dwingt de clients om een versleutelde verbinding te maken met %s"
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "E-mailserver"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Dit wordt gestuurd voor het verzenden van meldingen."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Afzenderadres"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Authenticatie vereist"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Server adres"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Poort"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Inloggegevens"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "SMTP gebruikersnaam"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "SMTP wachtwoord"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Test e-mailinstellingen"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Versturen e-mail"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log niveau"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Meer"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Minder"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versie"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -453,30 +607,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "App toevoegen"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Meer apps"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Selecteer een app"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Documentatie:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Zie de applicatiepagina op apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Zie website van de applicatie"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Gebruikersdocumentatie"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Beheerdersdocumentatie"
@@ -510,7 +668,7 @@ msgstr "Toon de Eerste start Wizard opnieuw"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -522,151 +680,149 @@ msgstr "Je wachtwoord is veranderd"
 msgid "Unable to change your password"
 msgstr "Niet in staat om uw wachtwoord te wijzigen"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nieuw"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Wijzig wachtwoord"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Volledige naam"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-mailadres"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Uw e-mailadres"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Vul een mailadres in om je wachtwoord te kunnen herstellen"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Vul een e-mailbericht in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profielafbeelding"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Upload een nieuwe"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Selecteer een nieuwe vanuit bestanden"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Verwijder afbeelding"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Of png, of jpg. Bij voorkeur vierkant, maar u kunt bijsnijden."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Uw avatar is verstrekt door uw originele account."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Afbreken"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Annuleer"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Kies als profielafbeelding"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Taal"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Help met vertalen"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Versleuteling"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten."
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Inlog-wachtwoord"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Decodeer alle bestanden"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Inlognaam"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
-msgstr "Creëer"
+msgstr "Aanmaken"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Beheer herstel wachtwoord"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Standaard Opslaglimiet"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ongelimiteerd"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Anders"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Opslaglimiet"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "wijzigen volledige naam"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "Instellen nieuw wachtwoord"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Standaard"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 563da00c9a..a4759a0e92 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# André Koot <meneer@tken.net>, 2013
+# André Koot <meneer@tken.net>, 2013-2014
 # kwillems <kwillems@zonnet.nl>, 2013
 # Len <lenny@weijl.org>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: André Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,43 +89,43 @@ msgstr "Succes"
 msgid "Error"
 msgstr "Fout"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Configuratie OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Configuratie onjuist"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Configuratie incompleet"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Selecteer groepen"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Selecteer objectklasse"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Selecteer attributen"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Verbindingstest geslaagd"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Verbindingstest mislukt"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Bevestig verwijderen"
 
@@ -143,11 +143,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s gebruiker gevonden"
 msgstr[1] "%s gebruikers gevonden"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Ongeldige server"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Kon de gewenste functie niet vinden"
 
@@ -165,8 +165,8 @@ msgstr "Help"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Beperk toegang tot %s tot groepen die voldoen aan deze criteria:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Groepsafspraken die voldoen aan deze criteria zijn beschikbaar in %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -201,8 +201,8 @@ msgid "groups found"
 msgstr "groepen gevonden"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Welk attribuut moet worden gebruikt als inlognaam:"
+msgid "Users login with this attribute:"
+msgstr "Gebruikers loggen in met dit attribuut:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -269,8 +269,8 @@ msgstr "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab G
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Beperk toegang tot %s tot gebruikers die voldoen aan deze criteria:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -412,41 +412,51 @@ msgstr "Attributen voor groepszoekopdrachten"
 msgid "Group-Member association"
 msgstr "Groepslid associatie"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Geneste groepen"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Wanneer ingeschakeld worden groepen binnen groepen ondersteund. (Werkt alleen als het groepslid attribuut DNs bevat)"
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Speciale attributen"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Quota veld"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Quota standaard"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "E-mailveld"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Gebruikers Home map naamgevingsregel"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Interne gebruikersnaam"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -462,15 +472,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Standaard wordt de interne gebruikersnaam aangemaakt op basis van het UUID attribuut. Het zorgt ervoor dat de gebruikersnaam uniek is en dat tekens niet hoeven te worden geconverteerd. De interne gebruikersnaam heeft als beperking dat alleen deze tekens zijn toegestaan​​: [a-zA-Z0-9_.@- ]. Andere tekens worden vervangen door hun ASCII vertaling of gewoonweg weggelaten. Bij identieke namen wordt een nummer toegevoegd of verhoogd. De interne gebruikersnaam wordt gebruikt om een ​​gebruiker binnen het systeem te herkennen. Het is ook de standaardnaam voor de standaardmap van de gebruiker in ownCloud. Het is ook een vertaling voor externe URL's, bijvoorbeeld voor alle *DAV diensten. Met deze instelling kan het standaardgedrag worden overschreven. Om een soortgelijk gedrag te bereiken als van vóór ownCloud 5, voer het gebruikersweergavenaam attribuut in in het volgende veld. Laat het leeg voor standaard gedrag. Veranderingen worden alleen toegepast op gekoppelde (toegevoegde) LDAP-gebruikers."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Interne gebruikersnaam attribuut:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Negeren UUID detectie"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -481,19 +491,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID attribuut voor gebruikers:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID attribuut voor groepen:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Gebruikersnaam-LDAP gebruikers vertaling"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -507,10 +517,10 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Leegmaken Groepsnaam-LDAP groep vertaling"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 0364a320a6..bde8baeea2 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +20,11 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s delte «%s» med deg"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -42,19 +41,6 @@ msgstr "Skrudde av vedlikehaldsmodus"
 msgid "Updated database"
 msgstr "Database oppdatert"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Oppdaterer mellomlager; dette kan ta ei god stund …"
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Mellomlager oppdatert"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "… %d %% ferdig …"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Inga bilete eller fil gitt"
@@ -75,135 +61,139 @@ msgstr "Inga midlertidig profilbilete tilgjengeleg, prøv igjen"
 msgid "No crop data provided"
 msgstr "Ingen beskjeringsdata gitt"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Søndag"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Måndag"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Desember"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Lagrar …"
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minutt sidan"
 msgstr[1] "%n minutt sidan"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n time sidan"
 msgstr[1] "%n timar sidan"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag sidan"
 msgstr[1] "%n dagar sidan"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "førre månad"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n månad sidan"
 msgstr[1] "%n månadar sidan"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "månadar sidan"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "i fjor"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "år sidan"
 
@@ -271,6 +261,26 @@ msgstr "({count} valte)"
 msgid "Error loading file exists template"
 msgstr "Klarte ikkje å lasta fil-finst-mal"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Delt"
@@ -279,12 +289,12 @@ msgstr "Delt"
 msgid "Share"
 msgstr "Del"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Feil"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Feil ved deling"
 
@@ -296,123 +306,123 @@ msgstr "Feil ved udeling"
 msgid "Error while changing permissions"
 msgstr "Feil ved endring av tillatingar"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med deg og gruppa {group} av {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Delt med deg av {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Passordvern"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Tillat offentleg opplasting"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Send lenkja over e-post"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Del over e-post:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Fann ingen personar"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "gruppe"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Vidaredeling er ikkje tillate"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {brukar}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Udel"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "kan endra"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "lag"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "del"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Passordverna"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Klarte ikkje fjerna utløpsdato"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Klarte ikkje setja utløpsdato"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Sender …"
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-post sendt"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Åtvaring"
 
@@ -459,11 +469,17 @@ msgstr "Oppdateringa feila. Ver venleg og rapporter feilen til <a href=\"https:/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Oppdateringa er fullført. Sender deg vidare til ownCloud no."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s passordnullstilling"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}"
@@ -483,8 +499,8 @@ msgstr "Førespurnaden feila!<br>Er du viss på at du skreiv inn rett e-post/bru
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du vil få ein e-post med ei lenkje for å nullstilla passordet."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Brukarnamn"
 
@@ -520,6 +536,18 @@ msgstr "Nytt passord"
 msgid "Reset password"
 msgstr "Nullstill passord"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personleg"
@@ -528,7 +556,7 @@ msgstr "Personleg"
 msgid "Users"
 msgstr "Brukarar"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Program"
 
@@ -638,49 +666,47 @@ msgstr "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> f
 msgid "Create an <strong>admin account</strong>"
 msgstr "Lag ein <strong>admin-konto</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avansert"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Set opp databasen"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "vil verta nytta"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasebrukar"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Databasenamn"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tabellnamnrom for database"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Databasetenar"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -696,7 +722,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -722,27 +748,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Gløymt passordet?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "hugs"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Logg inn"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternative innloggingar"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 08a93b7fab..9f4fa5869f 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,283 +20,290 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Klarte ikkje flytta %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Filnamnet kan ikkje vera tomt."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Klarte ikkje å endra opplastingsmappa."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Ugyldig token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen filer lasta opp. Ukjend feil"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Ingen feil, fila vart lasta opp"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: "
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fila vart berre delvis lasta opp"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Ingen filer vart lasta opp"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Manglar ei mellombels mappe"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Klarte ikkje skriva til disk"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Ikkje nok lagringsplass tilgjengeleg"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Feil ved opplasting. Klarte ikkje å finna opplasta fil."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Feil ved opplasting. Klarte ikkje å henta filinfo."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Ugyldig mappe."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte."
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Ikkje nok lagringsplass tilgjengeleg"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Opplasting avbroten."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Klarte ikkje å henta resultat frå tenaren."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} finst allereie"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Del"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Slett for godt"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Endra namn"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Under vegs"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "bytte ut {new_name} med {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mappe"
 msgstr[1] "%n mapper"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} og {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Lastar opp %n fil"
 msgstr[1] "Lastar opp %n filer"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "«.» er eit ugyldig filnamn."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Lagringa di er full, kan ikkje lenger oppdatera eller synkronisera!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Lagringa di er nesten full ({usedSpacePercent} %)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Gjer klar nedlastinga di. Dette kan ta ei stund viss filene er store."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Feil ved flytting av fil"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Feil"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Endra"
 
@@ -304,12 +311,12 @@ msgstr "Endra"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Klarte ikkje å omdøypa på %s"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Last opp"
 
@@ -345,72 +352,68 @@ msgstr "Maksimal storleik for ZIP-filer"
 msgid "Save"
 msgstr "Lagre"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Tekst fil"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Mappe"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Frå lenkje"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Sletta filer"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prøver å lasta opp er større enn maksgrensa til denne tenaren."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Skannar filer, ver venleg og vent."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Køyrande skanning"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Oppgraderer mellomlageret av filsystemet …"
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 63a65fd989..cba4f8cebb 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Lagrar …"
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 85acba6f70..6fe360ef9e 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Brukarar"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 78a8e15a2b..597087b12b 100644
--- a/l10n/nn_NO/files_sharing.po
+++ b/l10n/nn_NO/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 06:20+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Delt av {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -54,32 +58,16 @@ msgstr "deling er slått av"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Spør den som sende deg lenkje om du vil ha meir informasjon."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s delte mappa %s med deg"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s delte fila %s med deg"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Last ned"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Last opp"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Avbryt opplasting"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Inga førehandsvising tilgjengeleg for"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/nn_NO/files_trashbin.po b/l10n/nn_NO/files_trashbin.po
index 618246702e..d692d305c4 100644
--- a/l10n/nn_NO/files_trashbin.po
+++ b/l10n/nn_NO/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +19,48 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Klarte ikkje sletta %s for godt"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Klarte ikkje gjenoppretta %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Sletta filer"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Feil"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "gjenoppretta"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Ingenting her. Papirkorga di er tom!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Namn"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Sletta"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Sletta filer"
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index ec60d2c173..c38e2360ed 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,38 +19,38 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hjelp"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personleg"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Brukarar"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administrer"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -63,15 +63,10 @@ msgstr "Ukjend filtype"
 msgid "Invalid image"
 msgstr "Ugyldig bilete"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -94,74 +89,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Feil i autentisering"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Filer"
@@ -201,7 +200,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -229,20 +228,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -270,66 +269,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s delte «%s» med deg"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekund sidan"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n minutt sidan"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n timar sidan"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "i dag"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "i går"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n dagar sidan"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "førre månad"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n månadar sidan"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "i fjor"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "år sidan"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index c97bf982e4..2077d182fd 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,48 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-post sendt"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Klarer ikkje å lasta inn liste fra app-butikken"
@@ -116,62 +158,90 @@ msgstr "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til b
 msgid "Unable to change password"
 msgstr "Klarte ikkje å endra passordet"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Brukardokumentasjon"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Oppdater til {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Slå av"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Slå på"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Ver venleg og vent …"
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Klarte ikkje å skru av programmet"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Klarte ikkje å skru på programmet"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Oppdaterer …"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Feil ved oppdatering av app"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Feil"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Oppdater"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Oppdatert"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Vel eit profilbilete"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Lagrar …"
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "sletta"
@@ -184,40 +254,40 @@ msgstr "angra"
 msgid "Unable to remove user"
 msgstr "Klarte ikkje fjerna brukaren"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Gruppestyrar"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Slett"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "legg til gruppe"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Du må oppgje eit gyldig brukarnamn"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Feil ved oppretting av brukar"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Du må oppgje eit gyldig passord"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Nynorsk"
 
@@ -241,18 +311,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Logg inn"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Tryggleiksåtvaring"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -261,68 +355,68 @@ msgid ""
 "root."
 msgstr "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Oppsettsåtvaring"
 
-#: templates/admin.php:53
+#: 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 "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Ver venleg og dobbeltsjekk <a href=\"%s\">installasjonsrettleiinga</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen «fileinfo» manglar"
 
-#: templates/admin.php:68
+#: 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 "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Regionaldata fungerer ikkje"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Nettilkoplinga fungerer ikkje"
 
-#: templates/admin.php:121
+#: 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 "
@@ -331,118 +425,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Utfør éi oppgåve for kvar sidelasting"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Deling"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Slå på API-et for deling"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "La app-ar bruka API-et til deling"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Tillat lenkjer"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "La brukarar dela ting offentleg med lenkjer"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Tillat offentlege opplastingar"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "La brukarar tillata andre å lasta opp i deira offentleg delte mapper"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Tillat vidaredeling"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "La brukarar vidaredela delte ting"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "La brukarar dela med kven som helst"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "La brukarar dela berre med brukarar i deira grupper"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Tryggleik"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Krev HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tvingar klientar til å kopla til %s med ei kryptert tilkopling."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet)."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Tenaradresse"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Log nivå"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Meir"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Utgåve"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -452,30 +606,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Legg til din app"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Fleire app-ar"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Vel eit program"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Sjå programsida på apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Brukardokumentasjon"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administratordokumentasjon"
@@ -509,7 +667,7 @@ msgstr "Vis Oppstartvegvisaren igjen"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Passord"
 
@@ -521,151 +679,149 @@ msgstr "Passordet ditt er endra"
 msgid "Unable to change your password"
 msgstr "Klarte ikkje endra passordet"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Passord"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nytt passord"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Endra passord"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Di epost-adresse"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilbilete"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Last opp ny"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Vel ny frå Filer"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Fjern bilete"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Vel som profilbilete"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Hjelp oss å omsetja"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Kryptering"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Innloggingspassord"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Dekrypter alle filene"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Innloggingsnamn"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Lag"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Gjenopprettingspassord for administrator"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Standardlagring"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ubegrensa"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Anna"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Brukarnamn"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Lagring"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "lag nytt passord"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Standard"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 354e05bee4..37d6774cb7 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Feil"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Vel grupper"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "Hjelp"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/nqo/core.po b/l10n/nqo/core.po
index 4007dd3247..fca384c25d 100644
--- a/l10n/nqo/core.po
+++ b/l10n/nqo/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,131 +58,135 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -263,6 +253,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -271,12 +281,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -288,123 +298,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -451,11 +461,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -475,8 +491,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -512,6 +528,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -520,7 +548,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -630,49 +658,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +714,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -714,27 +740,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/nqo/files.po b/l10n/nqo/files.po
index 779270d084..5a44f766a2 100644
--- a/l10n/nqo/files.po
+++ b/l10n/nqo/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,233 +76,228 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -298,12 +305,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -339,72 +346,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/nqo/files_encryption.po b/l10n/nqo/files_encryption.po
index 0094acd72f..f8d0e13d32 100644
--- a/l10n/nqo/files_encryption.po
+++ b/l10n/nqo/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/nqo/files_external.po b/l10n/nqo/files_external.po
index bb48f60af6..144a1d0bff 100644
--- a/l10n/nqo/files_external.po
+++ b/l10n/nqo/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-09-07 04:40-0400\n"
-"PO-Revision-Date: 2013-09-07 07:28+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:453
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:457
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:460
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/nqo/files_sharing.po b/l10n/nqo/files_sharing.po
index 7d6dbe42c6..c1f02996c6 100644
--- a/l10n/nqo/files_sharing.po
+++ b/l10n/nqo/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/nqo/files_trashbin.po b/l10n/nqo/files_trashbin.po
index 69ea00584d..bd77f4c205 100644
--- a/l10n/nqo/files_trashbin.po
+++ b/l10n/nqo/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/nqo/lib.po b/l10n/nqo/lib.po
index 2ee237736f..27ffc71bf3 100644
--- a/l10n/nqo/lib.po
+++ b/l10n/nqo/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,62 +267,68 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/nqo/settings.po b/l10n/nqo/settings.po
index 20ff083d4c..9845d1695c 100644
--- a/l10n/nqo/settings.po
+++ b/l10n/nqo/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/nqo/user_ldap.po b/l10n/nqo/user_ldap.po
index a042730684..19a0957268 100644
--- a/l10n/nqo/user_ldap.po
+++ b/l10n/nqo/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 7ace16d573..152d585a7a 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Dimenge"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Diluns"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Dimarç"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Dijòus"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Divendres"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "genièr"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "febrièr"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "març"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "junh"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "julhet"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "agost"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "septembre"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "octobre"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Novembre"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Decembre"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Enregistra..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "uèi"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "ans a"
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr "Parteja"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Error"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Error al partejar"
 
@@ -293,123 +303,123 @@ msgstr "Error al non partejar"
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permissions"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Parat per senhal"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Senhal"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Met la data d'expiracion"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Data d'expiracion"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Parteja tras corrièl :"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Deguns trobat"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grop"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Tornar partejar es pas permis"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Pas partejador"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "pòt modificar"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "Contraròtle d'acces"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "met a jorn"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "escafa"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "parteja"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Parat per senhal"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Utiliza lo ligam seguent per tornar botar lo senhal : {link}"
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Reçaupràs un ligam per tornar botar ton senhal via corrièl."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Non d'usancièr"
 
@@ -517,6 +533,18 @@ msgstr "Senhal novèl"
 msgid "Reset password"
 msgstr "Senhal tornat botar"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -525,7 +553,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Usancièrs"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Apps"
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte admin</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avançat"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Dorsièr de donadas"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configura la basa de donadas"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "serà utilizat"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usancièr de la basa de donadas"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Senhal de la basa de donadas"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nom de la basa de donadas"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Espandi de taula de basa de donadas"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Òste de basa de donadas"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Configuracion acabada"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Sortida"
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "L'as perdut lo senhal ?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "bremba-te"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Dintrada"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 2fd5757cfc..7f609bb3b0 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Amontcargament capitat, pas d'errors"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Lo fichièr amontcargat es mai gròs que la directiva «MAX_FILE_SIZE» especifiada dins lo formulari HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Lo fichièr foguèt pas completament amontcargat"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Cap de fichièrs son estats amontcargats"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Un dorsièr temporari manca"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "L'escriptura sul disc a fracassat"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Fichièrs"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. "
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Parteja"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Error"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
@@ -301,12 +308,12 @@ msgstr "Modificat"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Amontcarga"
 
@@ -342,72 +349,68 @@ msgstr "Talha maximum de dintrada per fichièrs ZIP"
 msgid "Save"
 msgstr "Enregistra"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nòu"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Fichièr de tèxte"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Dorsièr"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Pas res dedins. Amontcarga qualquaren"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Escafa"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Amontcargament tròp gròs"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Los fiichièrs son a èsser explorats, "
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Exploracion en cors"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index c71d7b93c3..75356e1c04 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Enregistra..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index 853318c6d5..827bfb5aa7 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Usancièrs"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Escafa"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po
index 985ee59546..436924037b 100644
--- a/l10n/oc/files_sharing.po
+++ b/l10n/oc/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Avalcarga"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Amontcarga"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr " Anulla l'amontcargar"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/oc/files_trashbin.po b/l10n/oc/files_trashbin.po
index d1ca842a14..fd7ff1be9e 100644
--- a/l10n/oc/files_trashbin.po
+++ b/l10n/oc/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Error"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nom"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Escafa"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 3fa8719bf9..a753c84793 100644
--- a/l10n/oc/lib.po
+++ b/l10n/oc/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Ajuda"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Configuracion"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Usancièrs"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Services web jos ton contraròtle"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Avalcargar los ZIP es inactiu."
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Error d'autentificacion"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Fichièrs"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "uèi"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ièr"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "mes passat"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "an passat"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "ans a"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index d14a580b73..d71b89eca0 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Pas possible de cargar la tièra dempuèi App Store"
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Desactiva"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Activa"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Error"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Enregistra..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "defar"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grops"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grop Admin"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Escafa"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Login"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Avertiment de securitat"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Executa un prètfach amb cada pagina cargada"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Al partejar"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activa API partejada"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Jornal"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mai d'aquò"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +603,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Ajusta ton App"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Selecciona una applicacion"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Agacha la pagina d'applications en cò de apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licençiat per <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr ""
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr ""
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Senhal"
 
@@ -518,151 +676,149 @@ msgstr "Ton senhal a cambiat"
 msgid "Unable to change your password"
 msgstr "Pas possible de cambiar ton senhal"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Senhal en cors"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Senhal novèl"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Cambia lo senhal"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Corrièl"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Ton adreiça de corrièl"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Annula"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Lenga"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Ajuda a la revirada"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "Login"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Crea"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Autres"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Non d'usancièr"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 58d4c7ffba..1c69513cbd 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Error"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "Ajuda"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/pa/core.po b/l10n/pa/core.po
index d84cad3d41..b6b1af47d5 100644
--- a/l10n/pa/core.po
+++ b/l10n/pa/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -73,135 +59,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "ਐਤਵਾਰ"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "ਸੋਮਵਾਰ"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "ਮੰਗਲਵਾਰ"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "ਬੁੱਧਵਾਰ"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "ਵੀਰਵਾਰ"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "ਸ਼ੁੱਕਰਵਾਰ"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "ਸ਼ਨਿੱਚਰਵਾਰ"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "ਜਨਵਰੀ"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "ਫਰਵਰੀ"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "ਮਾਰਚ"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "ਅਪਰੈ"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "ਮਈ"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "ਜੂਨ"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "ਜੁਲਾਈ"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "ਅਗਸਤ"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "ਸਤੰਬ"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "ਅਕਤੂਬਰ"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "ਨਵੰਬ"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "ਦਸੰਬਰ"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "ਸੈਟਿੰਗ"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "ਅੱਜ"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ਕੱਲ੍ਹ"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "ਪਿਛਲੇ ਸਾਲ"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
 
@@ -269,6 +259,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -277,12 +287,12 @@ msgstr ""
 msgid "Share"
 msgstr "ਸਾਂਝਾ ਕਰੋ"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "ਗਲ"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -294,123 +304,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "ਪਾਸਵਰ"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "ਭੇਜੋ"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
@@ -457,11 +467,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -481,8 +497,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
 
@@ -518,6 +534,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -526,7 +554,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -636,49 +664,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -694,7 +720,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -720,27 +746,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/pa/files.po b/l10n/pa/files.po
index 5c76d7fda4..dc8e95181a 100644
--- a/l10n/pa/files.po
+++ b/l10n/pa/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "ਫਾਇਲਾਂ"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "ਸਾਂਝਾ ਕਰੋ"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "ਨਾਂ ਬਦਲੋ"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "ਵਾਪਸ"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "ਅੱਪਲੋਡ"
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "ਡਾਊਨਲੋਡ"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/pa/files_encryption.po b/l10n/pa/files_encryption.po
index 5b6b7d1300..078a3d3183 100644
--- a/l10n/pa/files_encryption.po
+++ b/l10n/pa/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/pa/files_external.po b/l10n/pa/files_external.po
index 2c798ff134..f72e18ae57 100644
--- a/l10n/pa/files_external.po
+++ b/l10n/pa/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/pa/files_sharing.po b/l10n/pa/files_sharing.po
index 3648d32e6a..93261c71ce 100644
--- a/l10n/pa/files_sharing.po
+++ b/l10n/pa/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "ਡਾਊਨਲੋਡ"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "ਅੱਪਲੋਡ"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "ਅੱਪਲੋਡ ਰੱਦ ਕਰੋ"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/pa/files_trashbin.po b/l10n/pa/files_trashbin.po
index 40900fcf33..386cfeb464 100644
--- a/l10n/pa/files_trashbin.po
+++ b/l10n/pa/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/pa/lib.po b/l10n/pa/lib.po
index a5ae066958..3977deb38b 100644
--- a/l10n/pa/lib.po
+++ b/l10n/pa/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "ਸੈਟਿੰਗ"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "ਫਾਇਲਾਂ"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "ਸਕਿੰਟ ਪਹਿਲਾਂ"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "ਅੱਜ"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ਕੱਲ੍ਹ"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "ਪਿਛਲੇ ਮਹੀਨੇ"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "ਪਿਛਲੇ ਸਾਲ"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "ਸਾਲਾਂ ਪਹਿਲਾਂ"
diff --git a/l10n/pa/settings.po b/l10n/pa/settings.po
index 20706ef03d..8f1df1750d 100644
--- a/l10n/pa/settings.po
+++ b/l10n/pa/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -114,61 +156,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "ਬੰਦ"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "ਚਾਲੂ"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "...ਉਡੀਕੋ ਜੀ"
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "ਅੱਪਡੇਟ ਕੀਤਾ"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -182,40 +252,40 @@ msgstr "ਵਾਪਸ"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "ਗਰੁੱਪ"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "ਗਰੁੱਪ ਐਡਮਿਨ"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "ਹਟਾਓ"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__ਭਾਸ਼ਾ_ਨਾਂ__"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "ਲਾਗਇਨ"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ"
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "ਸਰਵਰ ਐਡਰੈਸ"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,28 +604,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -507,7 +665,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "ਪਾਸਵਰ"
 
@@ -519,151 +677,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "ਪਾਸਵਰਡ ਬਦਲੋ"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "ਰੱਦ ਕਰੋ"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "ਲਾਗਇਨ"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "ਯੂਜ਼ਰ-ਨਾਂ"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/pa/user_ldap.po b/l10n/pa/user_ldap.po
index 57a5f5729e..1baf1bc601 100644
--- a/l10n/pa/user_ldap.po
+++ b/l10n/pa/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/owncloud/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 3bc8355954..92279c7d0a 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
-# bobie <maciej.przybecki@gmail.com>, 2013
+# maxxx <maxxxrally@gmail.com>, 2014
+# bobie <maciej.przybecki@gmail.com>, 2013-2014
 # adbrand <pkwiecin@adbrand.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-23 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 07:20+0000\n"
 "Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +21,11 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s Współdzielone »%s« z tobą"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "Data wygaśnięcia jest w przeszłości"
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nie można było wysłać wiadomości do następujących użytkowników: %s"
@@ -42,19 +42,6 @@ msgstr "Wyłączony tryb konserwacji"
 msgid "Updated database"
 msgstr "Zaktualizuj bazę"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Aktualizowanie filecache, to może potrwać bardzo długo..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Zaktualizuj filecache"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% udane ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Brak obrazu lub pliku dostarczonego"
@@ -75,139 +62,143 @@ msgstr "Brak obrazka profilu tymczasowego, spróbuj ponownie"
 msgid "No crop data provided"
 msgstr "Brak danych do przycięcia"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Środa"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Piątek"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Styczeń"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Luty"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Marzec"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Kwiecień"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Czerwiec"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Lipiec"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Sierpień"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Wrzesień"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Październik"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Listopad"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Grudzień"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Zapisywanie..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute temu"
 msgstr[1] "%n minut temu"
 msgstr[2] "%n minut temu"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n godzine temu"
 msgstr[1] "%n godzin temu"
 msgstr[2] "%n godzin temu"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "dziś"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dzień temu"
 msgstr[1] "%n dni temu"
 msgstr[2] "%n dni temu"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "w zeszłym miesiącu"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n miesiąc temu"
 msgstr[1] "%n miesięcy temu"
 msgstr[2] "%n miesięcy temu"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "w zeszłym roku"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "lat temu"
 
@@ -276,6 +267,26 @@ msgstr "({count} zaznaczonych)"
 msgid "Error loading file exists template"
 msgstr "Błąd podczas ładowania szablonu istniejącego pliku"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Bardzo słabe hasło"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Słabe hasło"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Mało skomplikowane hasło"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Dobre hasło"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Mocne hasło"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Udostępniono"
@@ -284,12 +295,12 @@ msgstr "Udostępniono"
 msgid "Share"
 msgstr "Udostępnij"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Błąd"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Błąd podczas współdzielenia"
 
@@ -301,123 +312,123 @@ msgstr "Błąd podczas zatrzymywania współdzielenia"
 msgid "Error while changing permissions"
 msgstr "Błąd przy zmianie uprawnień"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Udostępnione tobie i grupie {group} przez {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Udostępnione tobie przez {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Współdziel z użytkownikiem lub grupą ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Udostępnij link"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Zabezpiecz hasłem"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Hasło"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Pozwól na  publiczne wczytywanie"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Wyślij osobie odnośnik poprzez e-mail"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Wyślij"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Ustaw datę wygaśnięcia"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Data wygaśnięcia"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Współdziel poprzez e-mail:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Nie znaleziono ludzi"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupa"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Współdzielenie nie jest możliwe"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Współdzielone w {item} z {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Zatrzymaj współdzielenie"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "powiadom przez emaila"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "może edytować"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "kontrola dostępu"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "utwórz"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "uaktualnij"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "usuń"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "współdziel"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Zabezpieczone hasłem"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Błąd podczas usuwania daty wygaśnięcia"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Błąd podczas ustawiania daty wygaśnięcia"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Wysyłanie..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail wysłany"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -464,11 +475,17 @@ msgstr "Aktualizacja zakończyła się niepowodzeniem. Zgłoś ten problem <a hr
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s reset hasła"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Pojawił się problem podczas wysyłania wiadomości email, skontaktuj się z administratorem"
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Użyj tego odnośnika by zresetować hasło: {link}"
@@ -488,8 +505,8 @@ msgstr "Żądanie niepowiodło się!<br>Czy Twój email/nazwa użytkownika są p
 msgid "You will receive a link to reset your password via Email."
 msgstr "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
@@ -525,6 +542,18 @@ msgstr "Nowe hasło"
 msgid "Reset password"
 msgstr "Zresetuj hasło"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Osobiste"
@@ -533,7 +562,7 @@ msgstr "Osobiste"
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplikacje"
 
@@ -643,49 +672,47 @@ msgstr "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoz
 msgid "Create an <strong>admin account</strong>"
 msgstr "Utwórz <strong>konta administratora</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Zaawansowane"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Zasoby dysku & baza danych"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Katalog danych"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Skonfiguruj bazę danych"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "zostanie użyte"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Użytkownik bazy danych"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Hasło do bazy danych"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Obszar tabel bazy danych"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Komputer bazy danych"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Kończę ..."
 
@@ -701,7 +728,7 @@ msgstr "Ta aplikacja wymaga włączenia JavaScript do poprawnego działania. Pro
 msgid "%s is available. Get more information on how to update."
 msgstr "%s jest dostępna. Dowiedz się więcej na temat aktualizacji."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Wyloguj"
 
@@ -727,28 +754,28 @@ msgstr "Uwierzytelnianie po stronie serwera nie powiodło się!"
 msgid "Please contact your administrator."
 msgstr "Skontaktuj się z administratorem"
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Nie pamiętasz hasła?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "pamiętaj"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Zaloguj"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternatywne loginy"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Witam, <br><br>informuję, że %s udostępnianych zasobów <strong>%s</strong> jest z Tobą.<br><a href=\"%s\">Zobacz!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index c68288c62b..9473672b26 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,9 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
-# I Robot <owncloud-bot@tmit.eu>, 2013
-# bobie <maciej.przybecki@gmail.com>, 2013
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
+# I Robot, 2013
+# bobie <maciej.przybecki@gmail.com>, 2013-2014
 # Mariusz Fik <fisiu@opensuse.org>, 2013
 # Michal Plichta <mplichta@gmail.com>, 2013
 # adbrand <pkwiecin@adbrand.pl>, 2013
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-21 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 10:30+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,286 +23,293 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Nie można było przenieść %s - Plik o takiej nazwie już istnieje"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Nie można było przenieść %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Nazwa pliku nie może być pusta."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Nazwa pliku nie może zawierać \"/\". Proszę wybrać inną nazwę."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" jest nieprawidłową nazwą pliku."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "Folder docelowy został przeniesiony lub usunięty"
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Nazwa %s jest już używana w folderze %s. Proszę wybrać inną nazwę."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Niepoprawne źródło"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Serwer nie mógł otworzyć adresów URL, należy sprawdzić konfigurację serwera"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Błąd podczas pobierania %s do %S"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Błąd przy tworzeniu pliku"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Nazwa folderu nie może być pusta."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Nazwa folderu nie może zawierać \"/\". Proszę wybrać inną nazwę."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Błąd przy tworzeniu folderu"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Nie można ustawić katalog wczytywania."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Nieprawidłowy Token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Żaden plik nie został załadowany. Nieznany błąd"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Nie było błędów, plik wysłano poprawnie."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: "
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Wysłany plik przekracza wielkość dyrektywy MAX_FILE_SIZE określonej w formularzu HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Załadowany plik został wysłany tylko częściowo."
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Nie wysłano żadnego pliku"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Brak folderu tymczasowego"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Błąd zapisu na dysk"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Za mało dostępnego miejsca"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Nieudane przesłanie. Nie można pobrać informacji o pliku."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Nieudane przesłanie. Nie można pobrać informacji o pliku."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Zła ścieżka."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Pliki"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Za mało miejsca"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Całkowity rozmiar {size1} przekracza limit uploadu {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Nie można uzyskać wyniku z serwera."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL nie może być pusty"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "W katalogu domowym \"Shared\" jest zarezerwowana nazwa pliku"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} już istnieje"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Nie można utworzyć pliku"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Nie można utworzyć folderu"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Błąd przy pobieraniu adresu URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Udostępnij"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Trwale usuń"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Oczekujące"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Nie można zmienić nazwy pliku"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "zastąpiono {new_name} przez {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "cofnij"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Błąd podczas usuwania pliku"
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n katalog"
 msgstr[1] "%n katalogi"
 msgstr[2] "%n katalogów"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n plik"
 msgstr[1] "%n pliki"
 msgstr[2] "%n plików"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
-msgstr "{dirs} and {files}"
+msgstr "{dirs} i {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Wysyłanie %n pliku"
 msgstr[1] "Wysyłanie %n plików"
 msgstr[2] "Wysyłanie %n plików"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "„.” jest nieprawidłową nazwą pliku."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" jest nieprawidłową nazwą pliku."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Twój magazyn jest prawie pełny ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Aplikacja szyfrująca jest aktywna, ale twoje klucze nie zostały zainicjowane, prosze wyloguj się i zaloguj ponownie."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Klucz prywatny nie jest poprawny! Może Twoje hasło zostało zmienione z zewnątrz. Można zaktualizować hasło klucza prywatnego w ustawieniach osobistych w celu odzyskania dostępu do plików"
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Pobieranie jest przygotowywane. Może to zająć trochę czasu jeśli pliki są duże."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Błąd prz przenoszeniu pliku"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Błąd"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modyfikacja"
 
@@ -310,12 +317,12 @@ msgstr "Modyfikacja"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Niepoprawna nazwa folderu. Wykorzystanie \"Shared\" jest zarezerwowane."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nie można zmienić nazwy"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Wyślij"
 
@@ -351,72 +358,68 @@ msgstr "Maksymalna wielkość pliku wejściowego ZIP "
 msgid "Save"
 msgstr "Zapisz"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nowy"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Nowy plik tekstowy"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Plik tekstowy"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nowy folder"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Folder"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Z odnośnika"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Pliki usunięte"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Anuluj wysyłanie"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Nie masz uprawnień do wczytywania lub tworzenia plików w tym miejscu"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Pusto. Wyślij coś!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Pobierz"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Usuń"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Ładowany plik jest za duży"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Pliki, które próbujesz przesłać, przekraczają maksymalną dopuszczalną wielkość."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plików, proszę czekać."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Uaktualnianie plików pamięci podręcznej..."
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index 268225af9b..355b5601c1 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# maxxx <maxxxrally@gmail.com>, 2014
 # bobie <maciej.przybecki@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-13 14:43-0500\n"
-"PO-Revision-Date: 2013-12-13 14:46+0000\n"
-"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
+"POT-Creation-Date: 2014-03-13 17:12-0400\n"
+"PO-Revision-Date: 2014-03-13 07:10+0000\n"
+"Last-Translator: maxxx <maxxxrally@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,18 +83,18 @@ msgid ""
 "administrator"
 msgstr "Nieznany błąd proszę sprawdzić ustawienia systemu lub skontaktuj się z administratorem"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Brak wymagań."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone."
 
-#: hooks/hooks.php:278
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:"
 
@@ -101,9 +102,9 @@ msgstr "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Rozpoczęto szyfrowanie... To może chwilę potrwać. Proszę czekać."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Zapisywanie..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Trwa szyfrowanie początkowe...Spróbuj ponownie."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index 0f8b413e89..6b6c8c03df 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# bobie <maciej.przybecki@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2014-03-16 03:12-0400\n"
+"PO-Revision-Date: 2014-03-15 15:10+0000\n"
+"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +19,44 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Dostęp do"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Wystąpił błąd podczas konfigurowania zasobu Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Udziel dostępu"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Wystąpił błąd podczas konfigurowania zasobu Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Zapisano"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone.  Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +108,22 @@ msgid "Users"
 msgstr "Użytkownicy"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Usuń"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Włącz zewnętrzne zasoby dyskowe użytkownika"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Zezwalaj użytkownikom na montowanie  ich własnych zewnętrznych zasobów dyskowych"
+msgid "Allow users to mount the following external storage"
+msgstr "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Główny certyfikat SSL"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importuj główny certyfikat"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 26d13fcd20..a1b63c57f0 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# bobie <maciej.przybecki@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2014-03-16 03:12-0400\n"
+"PO-Revision-Date: 2014-03-15 15:10+0000\n"
+"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +19,10 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Udostępnione przez {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Udział ten jest chroniony hasłem"
@@ -54,32 +59,16 @@ msgstr "Udostępnianie jest wyłączone"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s współdzieli folder z tobą %s"
+msgid "shared by %s"
+msgstr "udostępniony przez %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s współdzieli z tobą plik %s"
+msgid "Download %s"
+msgstr "Pobierz %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Pobierz"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Wyślij"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Anuluj wysyłanie"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Podgląd nie jest dostępny dla"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Bezpośredni link"
diff --git a/l10n/pl/files_trashbin.po b/l10n/pl/files_trashbin.po
index bcd5e63eee..635883f2e4 100644
--- a/l10n/pl/files_trashbin.po
+++ b/l10n/pl/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nie można trwale usunąć %s"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Nie można przywrócić %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Pliki usunięte"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Błąd"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "przywrócony"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nic tu nie ma. Twój kosz jest pusty!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nazwa"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Przywróć"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Usunięte"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Usuń"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Usunięte pliki"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 2f3c4cb6cb..801c5b51c9 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
-# bobie <maciej.przybecki@gmail.com>, 2013
+# bobie <maciej.przybecki@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-16 03:12-0400\n"
+"PO-Revision-Date: 2014-03-15 15:10+0000\n"
+"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,38 +19,38 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Aplikacja \"%s\" nie może zostać zainstalowana, ponieważ nie jest zgodna z tą wersją ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Nie określono nazwy aplikacji"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Pomoc"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Osobiste"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administrator"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Błąd przy aktualizacji \"%s\"."
@@ -63,15 +63,10 @@ msgstr "Nieznany typ pliku"
 msgid "Invalid image"
 msgstr "Błędne zdjęcie"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "Kontrolowane serwisy"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "Nie można otworzyć \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Pobieranie ZIP jest wyłączone."
@@ -94,74 +89,78 @@ msgid ""
 "administrator."
 msgstr "Proszę ściągać pliki osobno w mniejszych paczkach lub poprosić administratora."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Nie określono źródła  podczas instalacji aplikacji"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Nie określono linku skąd aplikacja ma być zainstalowana"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Nie określono lokalnego pliku z którego miała być instalowana aplikacja"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Typ archiwum %s nie jest obsługiwany"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Nie udało się otworzyć archiwum podczas instalacji aplikacji"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Aplikacja nie posiada pliku info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Aplikacja nie może być zainstalowana ponieważ true tag nie jest <shipped>true</shipped> , co nie jest dozwolone dla aplikacji nie wysłanych"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Katalog aplikacji już isnieje"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Aplikacja nie jest włączona"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Błąd uwierzytelniania"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token wygasł. Proszę ponownie załadować stronę."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Nieznany użytkownik"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Pliki"
@@ -195,23 +194,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %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 "Należy wprowadzić istniejące konto użytkownika lub  administratora."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "Użytkownik i/lub hasło do MySQL/MariaDB są niepoprawne"
 
 #: 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 "Błąd DB: \"%s\""
@@ -220,30 +219,30 @@ msgstr "Błąd 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 "Niepoprawna komenda: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Użytkownik MySQL  '%s'@'localhost' już istnieje"
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "Użytkownik '%s'@'localhost' MySQL/MariaDB już istnieje."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Usuń tego użytkownika z MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Usuń tego użytkownika z MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Użytkownik MySQL  '%s'@'%%t' już istnieje"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "Użytkownik  '%s'@'%%' MySQL/MariaDB już istnieje."
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Usuń tego użytkownika z MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Usuń tego użytkownika z MySQL/MariaDB"
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -258,7 +257,7 @@ msgstr "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %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: Nazwa użytkownika i/lub hasło jest niepoprawne"
 
@@ -270,70 +269,76 @@ msgstr "Ustaw nazwę administratora."
 msgid "Set an admin password."
 msgstr "Ustaw hasło administratora."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s Współdzielone »%s« z tobą"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nie można odnaleźć kategorii \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minute temu"
 msgstr[1] "%n minut temu"
 msgstr[2] "%n minut temu"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n godzinę temu"
 msgstr[1] "%n godzin temu"
 msgstr[2] "%n godzin temu"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "dziś"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n dzień temu"
 msgstr[1] "%n dni temu"
 msgstr[2] "%n dni temu"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "w zeszłym miesiącu"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n miesiąc temu"
 msgstr[1] "%n miesięcy temu"
 msgstr[2] "%n miesięcy temu"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "w zeszłym roku"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "lat temu"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index e2ec0caf25..d1e47d0889 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
+# bobie <maciej.przybecki@gmail.com>, 2014
 # adbrand <pkwiecin@adbrand.pl>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-21 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 10:40+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 10:42+0000\n"
+"Last-Translator: bobie <maciej.przybecki@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +20,48 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Nieprawidłowa wartość %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Zapisano"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "przetestuj ustawienia email"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Pojawił się problem podczas wysyłania e-mail. Proszę sprawdzić ponownie ustawienia"
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-mail wysłany"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Tryb wysyłki"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Szyfrowanie"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Metoda autentykacji"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Nie można wczytać listy aplikacji"
@@ -115,62 +158,90 @@ msgstr "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownik
 msgid "Unable to change password"
 msgstr "Nie można zmienić hasła"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Wysyłam..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Dokumentacja użytkownika"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Dokumentacja Administratora"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Aktualizacja do {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Włącz"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Proszę czekać..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Błąd podczas wyłączania aplikacji"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Błąd podczas włączania aplikacji"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Aktualizacja w toku..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Błąd podczas aktualizacji aplikacji"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Błąd"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Zaktualizowano"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Wybierz zdjęcie profilu"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Bardzo słabe hasło"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Słabe hasło"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Mało skomplikowane hasło"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Dobre hasło"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Mocne hasło"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Zapisywanie..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "usunięto"
@@ -183,40 +254,40 @@ msgstr "cofnij"
 msgid "Unable to remove user"
 msgstr "Nie można usunąć użytkownika"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupy"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Administrator grupy"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Usuń"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "dodaj grupę"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Należy podać prawidłową nazwę użytkownika"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Błąd podczas tworzenia użytkownika"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Należy podać prawidłowe hasło"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "polski"
 
@@ -240,18 +311,42 @@ msgstr "Błędy i poważne problemy"
 msgid "Fatal issues only"
 msgstr "Tylko poważne problemy"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Nic"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Login"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Czysty tekst"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "NT LAN Manager"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Ostrzeżenie o zabezpieczeniach"
 
-#: templates/admin.php:25
+#: 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 ""
+msgstr "Uzyskujesz dostęp do %s za pomocą protokołu HTTP. Zalecamy skonfigurować swój serwer z użyciem protokołu HTTPS."
 
-#: templates/admin.php:39
+#: 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 "
@@ -260,68 +355,68 @@ msgid ""
 "root."
 msgstr "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Ostrzeżenia konfiguracji"
 
-#: templates/admin.php:53
+#: 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 "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Proszę sprawdź ponownie <a href=\"%s\">przewodnik instalacji</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Brak modułu „fileinfo”"
 
-#: templates/admin.php:68
+#: 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 "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Twoja wersja PHP jest za stara"
 
-#: templates/admin.php:82
+#: 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 "Twoja wersja PHP jest za stara. Rekomendujemy przynajmniej wersje 5.3.8. Jeśli masz starsza wersję ownCloud może nie działać poprawnie."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokalizacja nie działa"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
-msgstr ""
+msgstr "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików."
 
-#: templates/admin.php:106
+#: 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 ""
+msgstr "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Połączenie internetowe nie działa"
 
-#: templates/admin.php:121
+#: 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 "
@@ -330,118 +425,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Ostatni cron był uruchomiony %s."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron nie został jeszcze uruchomiony!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Wykonuj jedno zadanie wraz z każdą wczytaną stroną"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Użyj systemowego cron-a do uruchamiania cron.php raz na 15 minut."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Udostępnianie"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Włącz API udostępniania"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Zezwalaj aplikacjom na korzystanie z API udostępniania"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Zezwalaj na odnośniki"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Zezwalaj użytkownikom na publiczne współdzielenie zasobów za pomocą odnośników"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Pozwól na  publiczne wczytywanie"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Użytkownicy mogą włączyć dla innych wgrywanie do ich publicznych katalogów"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Zezwalaj na ponowne udostępnianie"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Zezwalaj użytkownikom na ponowne współdzielenie zasobów już z nimi współdzielonych"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Pozwól na mailowe powiadomienia"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Pozwól użytkownikom wysyłać maile powiadamiające o udostępnionych plikach"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Wymuś HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Serwer pocztowy"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "To jest używane do wysyłania powiadomień"
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Z adresu"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Wymagana autoryzacja"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Adres Serwera"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Poświadczenia"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "Użytkownik SMTP"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "Hasło SMTP"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Ustawienia testowej wiadomości"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Wyślij email"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Poziom logów"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Więcej"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mniej"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Wersja"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -451,30 +606,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Dodaj swoją aplikację"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Więcej aplikacji"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Zaznacz aplikację"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Dokumentacja:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Zobacz stronę aplikacji na apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Zobacz na stronie aplikacji"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Dokumentacja użytkownika"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentacja administratora"
@@ -508,7 +667,7 @@ msgstr "Uruchom ponownie kreatora pierwszego uruchomienia"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Hasło"
 
@@ -520,151 +679,149 @@ msgstr "Twoje hasło zostało zmienione"
 msgid "Unable to change your password"
 msgstr "Nie można zmienić hasła"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Bieżące hasło"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Pełna nazwa"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Twój adres e-mail"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Wypełnij adres email aby włączyć odzyskiwanie hasła oraz otrzymywać powiadomienia"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Zdjęcie profilu"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Wczytaj nowe"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Wybierz nowe z plików"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Usuń zdjęcie"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Png lub jpg. Idealnie kwadratowy, ale będzie można je przyciąć."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
-msgstr ""
+msgstr "Twój awatar jest ustawiony jako domyślny."
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Anuluj"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Wybierz zdjęcie profilu"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Język"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Pomóż w tłumaczeniu"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Szyfrowanie"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr ""
+msgstr "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Hasło logowania"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Odszyfruj wszystkie pliki"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Login"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Utwórz"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Odzyskiwanie hasła administratora"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Magazyn domyślny"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Bez limitu"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Inne"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Magazyn"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "Zmień pełna nazwę"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "ustaw nowe hasło"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Domyślny"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index f625cf545f..25da5a7a43 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -3,15 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013
+# Cyryl Sochacki <cyrylsochacki@gmail.com>, 2013-2014
+# hoek <hoek@hoek.pl>, 2014
 # orcio6 <orcio6@o2.pl>, 2013
+# maxxx <maxxxrally@gmail.com>, 2014
+# bobie <maciej.przybecki@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: maxxx <maxxxrally@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,24 +44,24 @@ msgstr "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
-msgstr ""
+msgstr "Konfiguracja jest nieprawidłowa. Proszę rzucić okiem na dzienniki dalszych szczegółów."
 
 #: ajax/wizard.php:32
 msgid "No action specified"
-msgstr ""
+msgstr "Nie określono akcji"
 
 #: ajax/wizard.php:38
 msgid "No configuration specified"
-msgstr ""
+msgstr "Nie określono konfiguracji"
 
 #: ajax/wizard.php:81
 msgid "No data specified"
-msgstr ""
+msgstr "Nie określono danych"
 
 #: ajax/wizard.php:89
 #, php-format
 msgid " Could not set configuration %s"
-msgstr ""
+msgstr "Nie można ustawić konfiguracji %s"
 
 #: js/settings.js:67
 msgid "Deletion failed"
@@ -88,43 +91,43 @@ msgstr "Sukces"
 msgid "Error"
 msgstr "Błąd"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
-msgstr ""
+msgstr "Konfiguracja poprawna"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
-msgstr ""
+msgstr "Konfiguracja niepoprawna"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
-msgstr ""
+msgstr "Konfiguracja niekompletna"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Wybierz grupy"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
-msgstr ""
+msgstr "Wybierz obiekty klas"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
-msgstr ""
+msgstr "Wybierz atrybuty"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Test połączenia udany"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Test połączenia nie udany"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Czy chcesz usunąć bieżącą konfigurację serwera?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Potwierdź usunięcie"
 
@@ -132,25 +135,25 @@ msgstr "Potwierdź usunięcie"
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%s znaleziona grupa"
+msgstr[1] "%s znalezionych grup"
+msgstr[2] "%s znalezionych grup"
 
 #: lib/wizard.php:122
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "%s znaleziony użytkownik"
+msgstr[1] "%s znalezionych użytkowników"
+msgstr[2] "%s znalezionych użytkowników"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
-msgstr ""
+msgstr "Niepoprawny Host"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
-msgstr ""
+msgstr "Nie można znaleźć żądanej funkcji"
 
 #: templates/part.settingcontrols.php:2
 msgid "Save"
@@ -166,63 +169,63 @@ msgstr "Pomoc"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr ""
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
 msgid "only those object classes:"
-msgstr ""
+msgstr "tylko te klasy obiektów:"
 
 #: templates/part.wizard-groupfilter.php:17
 #: templates/part.wizard-userfilter.php:17
 msgid "only from those groups:"
-msgstr ""
+msgstr "tylko z tych grup:"
 
 #: templates/part.wizard-groupfilter.php:25
 #: templates/part.wizard-loginfilter.php:32
 #: templates/part.wizard-userfilter.php:25
 msgid "Edit raw filter instead"
-msgstr ""
+msgstr "Edytuj zamiast tego czysty filtr"
 
 #: templates/part.wizard-groupfilter.php:30
 #: templates/part.wizard-loginfilter.php:37
 #: templates/part.wizard-userfilter.php:30
 msgid "Raw LDAP filter"
-msgstr ""
+msgstr "Czysty filtr LDAP"
 
 #: templates/part.wizard-groupfilter.php:31
 #, php-format
 msgid ""
 "The filter specifies which LDAP groups shall have access to the %s instance."
-msgstr ""
+msgstr "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s."
 
 #: templates/part.wizard-groupfilter.php:38
 msgid "groups found"
-msgstr ""
+msgstr "grup znaleziono"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr ""
+msgid "Users login with this attribute:"
+msgstr "Użytkownicy zalogowani z tymi ustawieniami:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
-msgstr ""
+msgstr "Nazwa użytkownika LDAP:"
 
 #: templates/part.wizard-loginfilter.php:16
 msgid "LDAP Email Address:"
-msgstr ""
+msgstr "LDAP Adres Email:"
 
 #: templates/part.wizard-loginfilter.php:24
 msgid "Other Attributes:"
-msgstr ""
+msgstr "Inne atrybuty:"
 
 #: templates/part.wizard-loginfilter.php:38
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\""
 
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
@@ -270,18 +273,18 @@ msgstr "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowa
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr ""
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
 msgid ""
 "The filter specifies which LDAP users shall have access to the %s instance."
-msgstr ""
+msgstr "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s."
 
 #: templates/part.wizard-userfilter.php:38
 msgid "users found"
-msgstr ""
+msgstr "użytkownicy znalezieni"
 
 #: templates/part.wizardcontrols.php:5
 msgid "Back"
@@ -296,7 +299,7 @@ msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
 " experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr ""
+msgstr "<b>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są  kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich."
 
 #: templates/settings.php:14
 msgid ""
@@ -351,7 +354,7 @@ msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
 msgid ""
 "Not recommended, use it for testing only! If connection only works with this"
 " option, import the LDAP server's SSL certificate in your %s server."
-msgstr ""
+msgstr "Nie polecane, używać tylko w celu testowania! Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP na swój %s."
 
 #: templates/settings.php:28
 msgid "Cache Time-To-Live"
@@ -371,7 +374,7 @@ msgstr "Pole wyświetlanej nazwy użytkownika"
 
 #: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "Atrybut LDAP służący do generowania wyświetlanej nazwy użytkownika ownCloud."
 
 #: templates/settings.php:33
 msgid "Base User Tree"
@@ -395,7 +398,7 @@ msgstr "Pole wyświetlanej nazwy grupy"
 
 #: templates/settings.php:35
 msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "Atrybut LDAP służący do generowania wyświetlanej nazwy grupy ownCloud."
 
 #: templates/settings.php:36
 msgid "Base Group Tree"
@@ -413,41 +416,51 @@ msgstr "Grupa atrybutów wyszukaj"
 msgid "Group-Member association"
 msgstr "Członek grupy stowarzyszenia"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Grupy zagnieżdżone"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Kiedy włączone, grupy, które zawierają grupy, są wspierane. (Działa tylko, jeśli członek grupy ma ustawienie DNs)"
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Specjalne atrybuty"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Pole przydziału"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Przydział domyślny"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "w bajtach"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Pole email"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Reguły nazewnictwa folderu domowego użytkownika"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Wewnętrzna nazwa użytkownika"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,17 +474,17 @@ msgid ""
 "behavior as before ownCloud 5 enter the user display name attribute in the "
 "following field. Leave it empty for default behavior. Changes will have "
 "effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Domyślnie, wewnętrzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna, a znaki nie muszą być konwertowane. Wewnętrzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. Pozostałe znaki zamieniane są na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa się powtarza na końcu jest dodawana / zwiększana cyfra. Wewnętrzna nazwa użytkownika służy do wewnętrznej identyfikacji użytkownika. Jest to również domyślna nazwa folderu domowego użytkownika. Jest to również część zdalnego adresu URL, na przykład dla wszystkich usług *DAV. Dzięki temu ustawieniu można nadpisywać domyślne zachowanie aplikacji. Aby osiągnąć podobny efekt jak przed ownCloud 5 wpisz atrybut nazwy użytkownika w poniższym polu. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników LDAP."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Wewnętrzny atrybut nazwy uzżytkownika:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Zastąp wykrywanie UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,21 +493,21 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr ""
+msgstr "Domyślnie, atrybut UUID jest wykrywany automatycznie. Atrybut UUID jest używany do niepodważalnej identyfikacji użytkowników i grup LDAP. Również wewnętrzna nazwa użytkownika zostanie stworzona na bazie UUID, jeśli nie zostanie podana powyżej. Możesz nadpisać to ustawienie i użyć atrybutu wedle uznania. Musisz się jednak upewnić, że atrybut ten może zostać pobrany zarówno dla użytkowników, jak i grup i jest unikalny. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników i grupy LDAP."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Atrybuty UUID dla użytkowników:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Atrybuty UUID dla grup:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Mapowanie użytkownika LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,12 +519,12 @@ msgid ""
 " is not configuration sensitive, it affects all LDAP configurations! Never "
 "clear the mappings in a production environment, only in a testing or "
 "experimental stage."
-msgstr ""
+msgstr "Nazwy użytkowników są używane w celu przechowywania i przypisywania (meta) danych. Aby dokładnie zidentyfikować i rozpoznać użytkowników, każdy użytkownik LDAP będzie miał wewnętrzną nazwę. To wymaga utworzenia przypisania nazwy użytkownika do użytkownika LDAP. Utworzona nazwa użytkownika jet przypisywana do UUID użytkownika LDAP. Dodatkowo DN jest również buforowany aby zmniejszyć interakcję z LDAP, ale nie jest używany do identyfikacji. Jeśli DN się zmieni, zmiany zostaną odnalezione. Wewnętrzny użytkownik jest używany we wszystkich przypadkach. Wyczyszczenie mapowań spowoduje pozostawienie wszędzie resztek informacji. Wyczyszczenie mapowań nie jest wrażliwe na konfigurację, wpływa ono na wszystkie konfiguracje LDAP! Nigdy nie czyść mapowań w środowisku produkcyjnym, tylko podczas testów lub w fazie eksperymentalnej. "
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Czyść Mapowanie użytkownika LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Czyść Mapowanie nazwy grupy LDAP"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 368acc1e41..9592e53fa5 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # bjamalaro <bjamalaro@yahoo.com.br>, 2013
-# Flávio Veras <flaviove@gmail.com>, 2013
+# Flávio Veras <flaviove@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-23 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 14:31+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,11 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s compartilhou »%s« com você"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "A data de vencimento passou."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Não foi possível enviar e-mail para os seguintes usuários: %s"
@@ -41,19 +40,6 @@ msgstr "Desligar o modo de manutenção"
 msgid "Updated database"
 msgstr "Atualizar o banco de dados"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Atualizar cahe de arquivos, isto pode levar algum tempo..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Atualizar cache de arquivo"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% concluído ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Nenhuma imagem ou arquivo fornecido"
@@ -74,135 +60,139 @@ msgstr "Sem imagem no perfil temporário disponível, tente novamente"
 msgid "No crop data provided"
 msgstr "Nenhum dado para coleta foi fornecido"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Segunda-feira"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "janeiro"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "fevereiro"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "março"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "abril"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "maio"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "junho"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "julho"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "agosto"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "setembro"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "outubro"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "novembro"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "dezembro"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Salvando..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] " ha %n minuto"
 msgstr[1] "ha %n minutos"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "ha %n hora"
 msgstr[1] "ha %n horas"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "ha %n dia"
 msgstr[1] "ha %n dias"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "último mês"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "ha %n mês"
 msgstr[1] "ha %n meses"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "último ano"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -270,6 +260,26 @@ msgstr "({count} selecionados)"
 msgid "Error loading file exists template"
 msgstr "Erro ao carregar arquivo existe modelo"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Senha muito fraca"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Senha fraca"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "So-so senha"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Boa senha"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Senha forte"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Compartilhados"
@@ -278,12 +288,12 @@ msgstr "Compartilhados"
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Erro ao compartilhar"
 
@@ -295,123 +305,123 @@ msgstr "Erro ao descompartilhar"
 msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissões"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartilhado com você e com o grupo {group} por {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Compartilhado com você por {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Compartilhar com usuário ou grupo ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Compartilher link"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Proteger com senha"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Senha"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Permitir upload público"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Enviar link por e-mail"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Definir data de expiração"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Compartilhar via e-mail:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Nenhuma pessoa encontrada"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Não é permitido re-compartilhar"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Compartilhado em {item} com {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "notificar por e-mail"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "controle de acesso"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "atualizar"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "remover"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "compartilhar"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protegido com senha"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiração"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiração"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Enviando ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Aviso"
 
@@ -458,11 +468,17 @@ msgstr "A atualização falhou. Por favor, relate este problema para a <a href=\
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A atualização teve êxito. Você será redirecionado ao ownCloud agora."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s redefinir senha"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Um problema ocorreu durante o envio do e-mail, por favor, contate o administrador."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Use o seguinte link para redefinir sua senha: {link}"
@@ -482,8 +498,8 @@ msgstr "O pedido falhou! <br>Certifique-se que seu e-mail/username estavam corre
 msgid "You will receive a link to reset your password via Email."
 msgstr "Você receberá um link para redefinir sua senha por e-mail."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nome de usuário"
 
@@ -519,6 +535,18 @@ msgstr "Nova senha"
 msgid "Reset password"
 msgstr "Redefinir senha"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Pessoal"
@@ -527,7 +555,7 @@ msgstr "Pessoal"
 msgid "Users"
 msgstr "Usuários"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplicações"
 
@@ -637,49 +665,47 @@ msgstr "Para obter informações sobre como configurar corretamente o seu servid
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta de administrador</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avançado"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Armazenamento & banco de dados"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configurar o banco de dados"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "será usado"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Usuário do banco de dados"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Senha do banco de dados"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Espaço de tabela do banco de dados"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Host do banco de dados"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Finalizando ..."
 
@@ -695,7 +721,7 @@ msgstr "Esta aplicação reque JavaScript habilidado para correta operação.\nP
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponível. Obtenha mais informações sobre como atualizar."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Sair"
 
@@ -721,28 +747,28 @@ msgstr "Autenticação do servidor falhou!"
 msgid "Please contact your administrator."
 msgstr "Por favor, contate o administrador."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Esqueceu sua senha?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Fazer login"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Logins alternativos"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Olá,<br><br>só gostaria que você soubesse que %s compartilhou »%s« com você.<br><a href=\"%s\">Veja isto!</a><br><br"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Olá,<br><br>só para seu conhecimento que %s compartilhou <strong>%s</strong> com você. <br><a href=\"%s\">Verificar!</a><br><br> "
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index ede91a81e9..127cadb9b9 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 # bjamalaro <bjamalaro@yahoo.com.br>, 2013
-# Flávio Veras <flaviove@gmail.com>, 2013
+# Flávio Veras <flaviove@gmail.com>, 2013-2014
 # tuliouel, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,283 +20,290 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Impossível mover %s - Um arquivo com este nome já existe"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Impossível mover %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "O nome do arquivo não pode estar vazio."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "O nome do arquivo não deve conter \"/\". Por favor, escolha um nome diferente."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" é um nome de arquivo inválido."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "A pasta de destino foi movida ou excluída."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "O nome %s já é usado na pasta %s. Por favor, escolha um nome diferente."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Não é uma fonte válida"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Não é permitido ao servidor abrir URLs, por favor verificar a configuração do servidor."
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Erro ao baixar %s para %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Erro ao criar o arquivo"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "O nome da pasta não pode estar vazio."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "O nome da pasta não pode conter \"/\". Por favor, escolha um nome diferente."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Erro ao criar a pasta"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Impossível configurar o diretório de upload"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Token inválido"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum arquivo foi enviado. Erro desconhecido"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Sem erros, o arquivo foi enviado com sucesso"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: "
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi parcialmente enviado"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo enviado"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Pasta temporária não encontrada"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Falha ao escrever no disco"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Espaço de armazenamento insuficiente"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Falha no envio. Não foi possível obter informações do arquivo."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Falha no envio. Não foi possível encontrar o arquivo enviado"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Falha no envio. Não foi possível obter informações do arquivo."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Diretório inválido."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Arquivos"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Espaço de armazenamento insuficiente"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Tamanho total do arquivo {size1} excede limite de envio {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Não foi possível obter o resultado do servidor."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do envio."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL não pode estar vazia"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Na pasta home 'Shared- Compartilhada' é um nome reservado"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} já existe"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Não foi possível criar o arquivo"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Não foi possível criar a pasta"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Erro ao buscar URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Compartilhar"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Excluir permanentemente"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Não foi possível renomear o arquivo"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "Substituído {old_name} por {new_name} "
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Erro eliminando o arquivo."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n pasta"
 msgstr[1] "%n pastas"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n arquivo"
 msgstr[1] "%n arquivos"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} e {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Enviando %n arquivo"
 msgstr[1] "Enviando %n arquivos"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' é um nome de arquivo inválido."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" é um nome de arquivo inválido."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Seu armazenamento está quase cheio ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "App de encriptação está ativado, mas as chaves não estão inicializadas, por favor log-out e faça login novamente"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Chave do App de Encriptação é inválida. Por favor, atualize sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Encriptação foi desabilitada mas seus arquivos continuam encriptados. Por favor vá a suas configurações pessoais para descriptar seus arquivos."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Seu download está sendo preparado. Isto pode levar algum tempo se os arquivos forem grandes."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Erro movendo o arquivo"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
@@ -304,12 +311,12 @@ msgstr "Modificado"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Nome da pasta inválido. Uso de 'Shared' é reservado."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s não pode ser renomeado"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Upload"
 
@@ -345,72 +352,68 @@ msgstr "Tamanho máximo para arquivo ZIP"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Novo arquivo texto"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Arquivo texto"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Pasta"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Do link"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Arquivos apagados"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Você não tem permissão para carregar ou criar arquivos aqui"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Scanning atual"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Atualizando cache do sistema de arquivos..."
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 0d4611d79d..231b3042b9 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # bjamalaro <bjamalaro@yahoo.com.br>, 2013
-# Flávio Veras <flaviove@gmail.com>, 2013
+# Flávio Veras <flaviove@gmail.com>, 2013-2014
 # wcavassin <cavassin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-12-02 16:30+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 13:00+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -83,18 +83,18 @@ msgid ""
 "administrator"
 msgstr "Erro desconhecido, por favor verifique suas configurações ou faça contato com o administrador"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Requisitos não encontrados."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Seguintes usuários não estão configurados para criptografia:"
 
@@ -102,9 +102,9 @@ msgstr "Seguintes usuários não estão configurados para criptografia:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Salvando..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Criptografia inicial em execução ... Por favor, tente novamente mais tarde."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 49e4100d52..51cc85df58 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Flávio Veras <flaviove@gmail.com>, 2013
+# Flávio Veras <flaviove@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 13:20+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acesso concedido"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Erro ao configurar armazenamento do Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Permitir acesso"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Por favor forneça um app key e secret válido do Dropbox"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Erro ao configurar armazenamento do Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Salvo"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Aviso:</b> \"smbclient\" não está instalado. Impossível montar compartilhamentos de CIFS/SMB. Por favor, peça ao seu administrador do sistema para instalá-lo."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Aviso:</b> O suporte para FTP do PHP não está ativado ou instalado. Impossível montar compartilhamentos FTP. Por favor, peça ao seu administrador do sistema para instalá-lo."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Usuários"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Habilitar Armazenamento Externo do Usuário"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Permitir usuários a montar seus próprios armazenamentos externos"
+msgid "Allow users to mount the following external storage"
+msgstr "Permitir que usuários montem o seguinte armazenamento externo"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Certificados SSL raíz"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importar Certificado Raíz"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 0e25ada0b9..959ab06aad 100644
--- a/l10n/pt_BR/files_sharing.po
+++ b/l10n/pt_BR/files_sharing.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Flávio Veras <flaviove@gmail.com>, 2013
+# Flávio Veras <flaviove@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 13:11+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Compartilhado por {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Este compartilhamento esta protegido por senha"
@@ -54,32 +58,16 @@ msgstr "compartilhamento está desativada"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mais informações, por favor, pergunte a pessoa que enviou este link."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s compartilhou a pasta %s com você"
+msgid "shared by %s"
+msgstr "compartilhado por %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s compartilhou o arquivo %s com você"
+msgid "Download %s"
+msgstr "Baixar %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Baixar"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Upload"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Cancelar upload"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Nenhuma visualização disponível para"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Link direto"
diff --git a/l10n/pt_BR/files_trashbin.po b/l10n/pt_BR/files_trashbin.po
index 3104219a27..12327626f9 100644
--- a/l10n/pt_BR/files_trashbin.po
+++ b/l10n/pt_BR/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Não foi possível excluir %s permanentemente"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Não foi possível restaurar %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Arquivos apagados"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Erro"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "restaurado"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Nada aqui. Sua lixeira está vazia!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nome"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Restaurar"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Excluído"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Excluir"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Arquivos Apagados"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index b6aa06fddb..933f86576a 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Flávio Veras <flaviove@gmail.com>, 2013
+# Flávio Veras <flaviove@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 13:20+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "O aplicativo \"%s\" não pode ser instalado porque não é compatível com esta versão do ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "O nome do aplicativo não foi especificado."
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Ajuda"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Pessoal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Ajustes"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Usuários"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Falha na atualização de \"%s\"."
@@ -62,15 +62,10 @@ msgstr "Tipo de arquivo desconhecido"
 msgid "Invalid image"
 msgstr "Imagem inválida"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "serviços web sob seu controle"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "não pode abrir \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Download ZIP está desligado."
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr "Por favor baixe os arquivos separadamente em pedaços ou educadamente pergunte ao seu administrador."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Nenhuma fonte foi especificada enquanto instalava o aplicativo"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Nenhuma href foi especificada enquanto instalava o aplicativo de httml"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Nenhum caminho foi especificado enquanto instalava o aplicativo do arquivo local"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Arquivos do tipo %s não são suportados"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Falha para abrir o arquivo enquanto instalava o aplicativo"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "O aplicativo não fornece um arquivo info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "O aplicativo não pode ser instalado porque a versão em info.xml /versão não é a mesma que a versão relatada na App Store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Diretório App  já existe"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Não é possível criar pasta app. Corrija as permissões. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Aplicação não está habilitada"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Erro de autenticação"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token expirou. Por favor recarregue a página."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Usuário desconhecido"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Arquivos"
@@ -200,8 +199,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Você precisa inserir uma conta existente ou o administrador."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Nome de usuário e/ou senha MySQL inválido(s)"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "MySQL/MariaDB nome de usuário e/ou senha não é válida"
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -228,21 +227,21 @@ msgstr "Comando ofensivo era: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "O usuário MySQL '%s'@'localhost' já existe."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "MySQL/MariaDB usuário '%s'@'localhost' já existe."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Derrubar este usuário do MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Eliminar esse usuário de MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Usuário MySQL '%s'@'%%' já existe"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "MySQL/MariaDB usuário '%s'@'%%' já existe"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Derrube este usuário do MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Eliminar esse usuário de MySQL/MariaDB"
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -269,66 +268,72 @@ msgstr "Defina um nome de usuário de administrador."
 msgid "Set an admin password."
 msgstr "Defina uma senha de administrador."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor, confira os <a href='%s'>guias de instalação</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s compartilhou »%s« com você"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Impossível localizar categoria \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "ha %n minutos"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "ha %n horas"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "hoje"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ontem"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "ha %n dias"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "último mês"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "ha %n meses"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "último ano"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "anos atrás"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 94e5cc8ff9..aed155f749 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # bjamalaro <bjamalaro@yahoo.com.br>, 2013
-# Flávio Veras <flaviove@gmail.com>, 2013
+# Flávio Veras <flaviove@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-05 22:23-0500\n"
-"PO-Revision-Date: 2013-12-05 10:30+0000\n"
+"POT-Creation-Date: 2014-03-28 01:55-0400\n"
+"PO-Revision-Date: 2014-03-27 19:31+0000\n"
 "Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,48 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Valor inválido fornecido para %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Salvo"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "testar configurações de email"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Se você recebeu este e-mail, as configurações parecem estar corretas."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "Ocorreu um problema ao enviar o e-mail. Por favor, reveja suas configurações."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-mail enviado"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Modo enviar"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Criptografia"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Método de autenticação"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Não foi possível carregar lista da App Store"
@@ -115,62 +157,90 @@ msgstr "Back-end não suporta alteração de senha, mas a chave de criptografia
 msgid "Unable to change password"
 msgstr "Impossível modificar senha"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Enviando..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Documentação de Usuário"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Documentação de Administrador"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Atualizar para {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Habilitar"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Por favor, aguarde..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Erro enquanto desabilitava o aplicativo"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Erro enquanto habilitava o aplicativo"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Atualizando..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Erro ao atualizar aplicativo"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Erro"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Atualizar"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Atualizado"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Selecione uma imagem para o perfil"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Senha muito fraca"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Senha fraca"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "So-so senha"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Boa senha"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Senha forte"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Salvando..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "excluído"
@@ -183,40 +253,40 @@ msgstr "desfazer"
 msgid "Unable to remove user"
 msgstr "Impossível remover usuário"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupo Administrativo"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Excluir"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "adicionar grupo"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Forneça um nome de usuário válido"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Erro ao criar usuário"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Forneça uma senha válida"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Aviso: O diretório home para o usuário \"{user}\" já existe"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Português (Brasil)"
 
@@ -240,18 +310,42 @@ msgstr "Erros e problemas fatais"
 msgid "Fatal issues only"
 msgstr "Somente questões fatais"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Nada"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Login"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Plano"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "Gerenciador NT LAN"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Aviso de Segurança"
 
-#: templates/admin.php:25
+#: 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 "Você está acessando %s via HTTP. Sugerimos você configurar o servidor para exigir o uso de HTTPS em seu lugar."
 
-#: templates/admin.php:39
+#: 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 "
@@ -260,68 +354,68 @@ msgid ""
 "root."
 msgstr "Seu diretório de dados e seus arquivos são, provavelmente, acessíveis a partir da internet. O arquivo htaccess. não está funcionando. Nós sugerimos fortemente que você configure o seu servidor web de uma forma que o diretório de dados não esteja mais acessível ou mova o diretório de dados para fora do raiz do servidor."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Aviso de Configuração"
 
-#: templates/admin.php:53
+#: 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 "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Por favor, verifique os <a href='%s'>guias de instalação</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Módulo 'fileinfo' faltando"
 
-#: templates/admin.php:68
+#: 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 "O módulo PHP 'fileinfo' está faltando. Recomendamos que ative este módulo para obter uma melhor detecção do tipo de mídia (mime-type)."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Sua versão de PHP está desatualizada"
 
-#: templates/admin.php:82
+#: 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 "A sua versão do PHP está desatualizada. Recomendamos a atualização para 5.3.8 ou mais recente, pois as versões mais antigas são conhecidas por serem quebradas. É possível que esta instalação não esteja funcionando corretamente."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Localização não funcionando"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Localidade do sistema não pode ser definido como um que suporta UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Isso significa que pode haver problemas com certos caracteres nos nomes de arquivo."
 
-#: templates/admin.php:106
+#: 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 "Nós sugerimos para instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Sem conexão com a internet"
 
-#: templates/admin.php:121
+#: 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 "
@@ -330,118 +424,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Último cron foi executado em %s."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "Última cron foi executado em %s. Isso é, mais do que uma hora atrás, algo parece errado."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron não foi executado ainda!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Execute uma tarefa com cada página carregada"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Use o sistema de serviço cron para chamar o arquivo cron.php a cada 15 minutos."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Compartilhamento"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Habilitar API de Compartilhamento"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que aplicativos usem a API de Compartilhamento"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que usuários compartilhem itens com o público usando links"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir envio público"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir que usuários deem permissão a outros para enviarem arquivios para suas pastas compartilhadas publicamente"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir recompartilhamento"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que usuários compartilhem novamente itens compartilhados com eles"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir que usuários compartilhem com qualquer um"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que usuários compartilhem somente com usuários em seus grupos"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir notificação por email"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Permitir usuários enviar notificação por email de arquivos compartilhados"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Obrigar os clientes que se conectem a %s através de uma conexão criptografada."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Servidor de Email"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Isto é usado para o envio de notificações."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Do Endereço"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Autenticação é requerida"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Endereço do servidor"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Porta"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Credenciais"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "Nome do Usuário SMTP"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "Senha SMTP"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Configurações de e-mail de teste"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Enviar email"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nível de registro"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -451,30 +605,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Adicione seu Aplicativo"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Mais Apps"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Selecione um Aplicativo"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Documentação:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver página do aplicativo em apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Consulte o site aplicação"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Documentação de Usuário"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentação de Administrador"
@@ -508,7 +666,7 @@ msgstr "Mostrar este Assistente de novo"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Senha"
 
@@ -520,151 +678,149 @@ msgstr "Sua senha foi alterada"
 msgid "Unable to change your password"
 msgstr "Não é possivel alterar a sua senha"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Senha atual"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nova senha"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Alterar senha"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Nome Completo"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Seu endereço de e-mail"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Preencha um endereço de e-mail para habilitar a recuperação de senha"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Preencha com um e-mail para permitir a recuperação de senha e receber notificações"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Imagem para o perfil"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Enviar nova foto"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Selecinar uma nova dos Arquivos"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Remover imagem"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Seu avatar é fornecido por sua conta original."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Abortar"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Escolha como imagem para o perfil"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Criptografia"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Senha de login"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Decripti todos os Arquivos"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Nome de Login"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Criar"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Recuperação da Senha do Administrador"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha."
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Armazenamento Padrão"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nome de Usuário"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "alterar nome completo"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "definir nova senha"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Padrão"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 6fd04f0749..f8940d0e55 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Flávio Veras <flaviove@gmail.com>, 2013
+# Flávio Veras <flaviove@gmail.com>, 2013-2014
 # tuliouel, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: Flávio Veras <flaviove@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,43 +88,43 @@ msgstr "Sucesso"
 msgid "Error"
 msgstr "Erro"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Configuração OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Configuração incorreta"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Configuração incompleta"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Selecionar grupos"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Selecione classes de objetos"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Selecione os atributos"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Teste de conexão bem sucedida"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Teste de conexão falhou"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Você quer realmente deletar as atuais Configurações de Servidor?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Confirmar Exclusão"
 
@@ -142,11 +142,11 @@ msgid_plural "%s users found"
 msgstr[0] "usuário %s encontrado"
 msgstr[1] "usuários %s encontrados"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Host inválido"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Não foi possível encontrar a função desejada"
 
@@ -164,8 +164,8 @@ msgstr "Ajuda"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Limitar o acesso a %s para grupos que coincidam com estes critérios:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Grupos que satisfazem estes critérios estão disponíveis em %s:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -200,8 +200,8 @@ msgid "groups found"
 msgstr "grupos encontrados"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "O atributo deve ser usado como nome de login:"
+msgid "Users login with this attribute:"
+msgstr "Usuários entrar com este atributo:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -268,8 +268,8 @@ msgstr "Você pode especificar DN Base para usuários e grupos na guia Avançada
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Limitar o acesso a %s para usuários que coincidam com estes critérios:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr "Limitar o acesso %s para usuários que satisfazem esses critérios:"
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -411,41 +411,51 @@ msgstr "Atributos de Busca de Grupo"
 msgid "Group-Member association"
 msgstr "Associação Grupo-Membro"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Grupos Aninhados"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Quando habilitado, os grupos que contêm os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)"
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Atributos Especiais"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Campo de Cota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Cota Padrão"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Campo de Email"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Regra para Nome da Pasta Pessoal do Usuário"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Nome de usuário interno"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é único e que caracteres não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_.@- ]. Outros caracteres são substituídos por seus correspondentes em ASCII ou simplesmente serão omitidos. Em caso de colisão um número será adicionado/aumentado. O nome de usuário interno é usado para identificar um usuário internamente. É também o nome padrão da pasta \"home\" do usuário. É também parte de URLs remotas, por exemplo, para todos as instâncias *DAV. Com esta definição, o comportamento padrão pode ser sobrescrito. Para alcançar um comportamento semelhante ao de antes do ownCloud 5, forneça o atributo do nome de exibição do usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários LDAP recém mapeados (adicionados)."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atributo Interno de Nome de Usuário:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Substituir detecção UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Por padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar, sem dúvidas, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuários como para grupos, e que seja único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados)."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID Atributos para Usuários:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID Atributos para Grupos:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Usuário-LDAP Mapeamento de Usuário"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr "Nomes de usuários sãi usados para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interação LDAP, mas não é utilizado para a identificação. Se o DN muda, as mudanças serão encontradas. O nome de usuário interno é utilizado em todo lugar. Limpar os mapeamentos não influencia a configuração. Limpar os mapeamentos deixará rastros em todo lugar. Limpar os mapeamentos não influencia a configuração, mas afeta as configurações LDAP! Somente limpe os mapeamentos em embiente de testes ou em estágio experimental."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar Mapeamento de Usuário Nome de Usuário-LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index cc4b1340ad..30a03fb0c3 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -3,19 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bruno Martins <brunomomartins@gmail.com>, 2013
+# Bruno Martins <inactive+skorzen@transifex.com>, 2013
 # bmgmatias <bmgmatias@gmail.com>, 2013
+# Carlos <crolidge@gmail.com>, 2014
 # Mouxy <daniel@mouxy.net>, 2013
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
 # Gontxi <goncalo.baiao@gmail.com>, 2013
-# Helder Meneses <helder.meneses@gmail.com>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,15 +24,14 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s partilhado »%s« contigo"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Não conseguiu enviar correio aos seguintes utilizadores: %s"
 
 #: ajax/update.php:11
 msgid "Turned on maintenance mode"
@@ -45,19 +45,6 @@ msgstr "Desactivado o modo de manutenção"
 msgid "Updated database"
 msgstr "Base de dados actualizada"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "A actualizar o cache dos ficheiros, poderá demorar algum tempo..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Actualizado o cache dos ficheiros"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% feito ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Não foi selecionado nenhum ficheiro para importar"
@@ -76,137 +63,141 @@ msgstr "Foto temporária de perfil indisponível, tente novamente"
 
 #: avatar/controller.php:135
 msgid "No crop data provided"
-msgstr ""
+msgstr "Sem dados de corte fornecidos"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Domingo"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Segunda"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Terça"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Quarta"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Quinta"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Sexta"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sábado"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Janeiro"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Março"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Abril"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maio"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Junho"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Julho"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Agosto"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Setembro"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Outubro"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Novembro"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Dezembro"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "A guardar..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "Minutos atrás"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minuto atrás"
 msgstr[1] "%n minutos atrás"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n hora atrás"
 msgstr[1] "%n horas atrás"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dia atrás"
 msgstr[1] "%n dias atrás"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "ultímo mês"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n mês atrás"
 msgstr[1] "%n meses atrás"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "meses atrás"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "anos atrás"
 
@@ -216,7 +207,7 @@ msgstr "Escolha"
 
 #: js/oc-dialogs.js:146
 msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Erro ao carregar o modelo de selecionador de ficheiro: {error}"
 
 #: js/oc-dialogs.js:172
 msgid "Yes"
@@ -237,12 +228,12 @@ msgstr "Erro ao carregar o template: {error}"
 #: js/oc-dialogs.js:347
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{count} conflicto de ficheiro"
+msgstr[1] "{count} conflitos de ficheiro"
 
 #: js/oc-dialogs.js:361
 msgid "One file conflict"
-msgstr ""
+msgstr "Um conflito no ficheiro"
 
 #: js/oc-dialogs.js:367
 msgid "Which files do you want to keep?"
@@ -252,7 +243,7 @@ msgstr "Quais os ficheiros que pretende manter?"
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr ""
+msgstr "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome."
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
@@ -272,6 +263,26 @@ msgstr "({count} seleccionados)"
 
 #: js/oc-dialogs.js:457
 msgid "Error loading file exists template"
+msgstr "Erro ao carregar o modelo de existências do ficheiro"
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
 msgstr ""
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
@@ -282,12 +293,12 @@ msgstr "Partilhado"
 msgid "Share"
 msgstr "Partilhar"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Erro"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Erro ao partilhar"
 
@@ -299,123 +310,123 @@ msgstr "Erro ao deixar de partilhar"
 msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissões"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Partilhado consigo e com o grupo {group} por {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Partilhado consigo por {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
-msgstr ""
+msgstr "Partilhar com utilizador ou grupo..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Partilhar o link"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Proteger com palavra-passe"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Permitir Envios Públicos"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Enviar o link por e-mail"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Especificar data de expiração"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Partilhar via email:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Não foi encontrado ninguém"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupo"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Não é permitido partilhar de novo"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Partilhado em {item} com {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "Notificar por email"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "Controlo de acesso"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "apagar"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "partilhar"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protegido com palavra-passe"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiração"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiração"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "A Enviar..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-mail enviado"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Aviso"
 
@@ -425,7 +436,7 @@ msgstr "O tipo de objecto não foi especificado"
 
 #: js/tags.js:13
 msgid "Enter new"
-msgstr ""
+msgstr "Introduza novo"
 
 #: js/tags.js:27
 msgid "Delete"
@@ -437,19 +448,19 @@ msgstr "Adicionar"
 
 #: js/tags.js:39
 msgid "Edit tags"
-msgstr ""
+msgstr "Editar etiquetas"
 
 #: js/tags.js:57
 msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "Erro ao carregar modelo de diálogo: {error}"
 
 #: js/tags.js:261
 msgid "No tags selected for deletion."
-msgstr ""
+msgstr "Não foram escolhidas etiquetas para apagar."
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr ""
+msgstr "Por favor recarregue a página."
 
 #: js/update.js:17
 msgid ""
@@ -462,11 +473,17 @@ msgstr "A actualização falhou. Por favor reporte este incidente seguindo este
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "A actualização foi concluída com sucesso. Vai ser redireccionado para o ownCloud agora."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s reposição da password"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Use o seguinte endereço para repor a sua password: {link}"
@@ -486,8 +503,8 @@ msgstr "O pedido falhou! <br> Tem a certeza que introduziu o seu email/username
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vai receber um endereço para repor a sua password"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nome de utilizador"
 
@@ -523,6 +540,18 @@ msgstr "Nova palavra-chave"
 msgid "Reset password"
 msgstr "Repor password"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Pessoal"
@@ -531,7 +560,7 @@ msgstr "Pessoal"
 msgid "Users"
 msgstr "Utilizadores"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplicações"
 
@@ -545,31 +574,31 @@ msgstr "Ajuda"
 
 #: tags/controller.php:22
 msgid "Error loading tags"
-msgstr ""
+msgstr "Erro ao carregar etiquetas"
 
 #: tags/controller.php:48
 msgid "Tag already exists"
-msgstr ""
+msgstr "A etiqueta já existe"
 
 #: tags/controller.php:64
 msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "Erro ao apagar etiqueta(s)"
 
 #: tags/controller.php:75
 msgid "Error tagging"
-msgstr ""
+msgstr "Erro ao etiquetar"
 
 #: tags/controller.php:86
 msgid "Error untagging"
-msgstr ""
+msgstr "Erro ao desetiquetar"
 
 #: tags/controller.php:97
 msgid "Error favoriting"
-msgstr ""
+msgstr "Erro a definir como favorito"
 
 #: tags/controller.php:108
 msgid "Error unfavoriting"
-msgstr ""
+msgstr "Erro a remover como favorito"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -587,7 +616,7 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Olá,\n\napenas para informar que %s partilhou »%s« consigo.\nConsulte aqui: %s\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
@@ -596,7 +625,7 @@ msgstr "Esta partilha vai expirar em %s."
 
 #: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
-msgstr ""
+msgstr "Parabéns!"
 
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
@@ -641,49 +670,47 @@ msgstr "Para obter informações de como configurar correctamente o servidor, ve
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta administrativa</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avançado"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configure a base de dados"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "vai ser usada"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Utilizador da base de dados"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Password da base de dados"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Nome da base de dados"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tablespace da base de dados"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Anfitrião da base de dados"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Acabar instalação"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "A terminar..."
 
@@ -692,14 +719,14 @@ msgid ""
 "This application requires JavaScript to be enabled for correct operation.  "
 "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
 "JavaScript</a> and re-load this interface."
-msgstr ""
+msgstr "Esta aplicação requer JavaScript ativado para uma operação correta. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">ative o JavaScript</a> e recarregue esta interface."
 
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s está disponível. Tenha mais informações como actualizar."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Sair"
 
@@ -719,48 +746,48 @@ msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo."
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
-msgstr ""
+msgstr "Autenticação do lado do servidor falhou!"
 
 #: templates/login.php:18
 msgid "Please contact your administrator."
 msgstr "Por favor contacte o administrador."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Esqueceu-se da sua password?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "lembrar"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Entrar"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Contas de acesso alternativas"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
-msgstr ""
+msgstr "Esta instância do ownCloud está actualmente configurada no modo de utilizador único."
 
 #: templates/singleuser.user.php:4
 msgid "This means only administrators can use the instance."
-msgstr ""
+msgstr "Isto significa que apenas os administradores podem usar a instância."
 
 #: templates/singleuser.user.php:5 templates/update.user.php:5
 msgid ""
 "Contact your system administrator if this message persists or appeared "
 "unexpectedly."
-msgstr ""
+msgstr "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente."
 
 #: templates/singleuser.user.php:7 templates/update.user.php:6
 msgid "Thank you for your patience."
@@ -774,8 +801,8 @@ msgstr "A actualizar o ownCloud para a versão %s, esta operação pode demorar.
 #: templates/update.user.php:3
 msgid ""
 "This ownCloud instance is currently being updated, which may take a while."
-msgstr ""
+msgstr "Esta instância do ownCloud está a ser actualizada, poderá demorar algum tempo."
 
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
-msgstr ""
+msgstr "Por favo recarregue esta página após algum tempo para continuar a usar ownCloud."
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 97c3bb28e4..5d3d9a8a8d 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # bmgmatias <bmgmatias@gmail.com>, 2013
+# Carlos <crolidge@gmail.com>, 2014
 # FernandoMASilva, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,296 +21,303 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr "Não foi possível mover o ficheiro %s - Já existe um ficheiro com esse nome"
+msgstr "Não pôde mover o ficheiro %s - Já existe um ficheiro com esse nome"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Não foi possível move o ficheiro %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "O nome do ficheiro não pode estar vazio."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:63
 #, php-format
-msgid ""
-"The name %s is already used in the folder %s. Please choose a different "
-"name."
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:81
-msgid "Not a valid source"
-msgstr ""
-
-#: ajax/newfile.php:86
-msgid ""
-"Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
-
-#: ajax/newfile.php:103
-#, php-format
-msgid "Error while downloading %s to %s"
-msgstr ""
-
-#: ajax/newfile.php:140
-msgid "Error when creating the file"
-msgstr ""
-
-#: ajax/newfolder.php:21
-msgid "Folder name cannot be empty."
-msgstr ""
-
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
-msgid "Error when creating the folder"
-msgstr ""
-
-#: ajax/upload.php:18 ajax/upload.php:50
-msgid "Unable to set upload directory."
-msgstr "Não foi possível criar o diretório de upload"
-
-#: ajax/upload.php:27
-msgid "Invalid Token"
-msgstr "Token inválido"
-
-#: ajax/upload.php:64
-msgid "No file was uploaded. Unknown error"
-msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
-
-#: ajax/upload.php:71
-msgid "There is no error, the file uploaded with success"
-msgstr "Não ocorreram erros, o ficheiro foi submetido com sucesso"
-
-#: ajax/upload.php:72
-msgid ""
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize"
-
-#: ajax/upload.php:74
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML"
-
-#: ajax/upload.php:75
-msgid "The uploaded file was only partially uploaded"
-msgstr "O ficheiro seleccionado foi apenas carregado parcialmente"
-
-#: ajax/upload.php:76
-msgid "No file was uploaded"
-msgstr "Nenhum ficheiro foi submetido"
-
-#: ajax/upload.php:77
-msgid "Missing a temporary folder"
-msgstr "Está a faltar a pasta temporária"
-
-#: ajax/upload.php:78
-msgid "Failed to write to disk"
-msgstr "Falhou a escrita no disco"
-
-#: ajax/upload.php:96
-msgid "Not enough storage available"
-msgstr "Não há espaço suficiente em disco"
-
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "O carregamento falhou. Não foi possível obter a informação do ficheiro."
-
-#: ajax/upload.php:144
-msgid "Upload failed. Could not find uploaded file"
-msgstr ""
-
-#: ajax/upload.php:172
-msgid "Invalid directory."
-msgstr "Directório Inválido"
-
-#: appinfo/app.php:11
-msgid "Files"
-msgstr "Ficheiros"
-
-#: js/file-upload.js:228
-msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Espaço em disco insuficiente!"
-
-#: js/file-upload.js:306
-msgid "Upload cancelled."
-msgstr "Envio cancelado."
-
-#: js/file-upload.js:344
-msgid "Could not get result from server."
-msgstr "Não foi possível obter o resultado do servidor."
-
-#: js/file-upload.js:436
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
-
-#: js/file-upload.js:523
-msgid "URL cannot be empty"
-msgstr ""
-
-#: js/file-upload.js:527 js/filelist.js:377
-msgid "In the home folder 'Shared' is a reserved filename"
-msgstr ""
-
-#: js/file-upload.js:529 js/filelist.js:379
-msgid "{new_name} already exists"
-msgstr "O nome {new_name} já existe"
-
-#: js/file-upload.js:595
-msgid "Could not create file"
-msgstr ""
-
-#: js/file-upload.js:611
-msgid "Could not create folder"
-msgstr ""
-
-#: js/file-upload.js:661
-msgid "Error fetching URL"
-msgstr ""
-
-#: js/fileactions.js:125
-msgid "Share"
-msgstr "Partilhar"
-
-#: js/fileactions.js:137
-msgid "Delete permanently"
-msgstr "Eliminar permanentemente"
-
-#: js/fileactions.js:194
-msgid "Rename"
-msgstr "Renomear"
-
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
-msgid "Pending"
-msgstr "Pendente"
-
-#: js/filelist.js:405
-msgid "Could not rename file"
-msgstr ""
-
-#: js/filelist.js:539
-msgid "replaced {new_name} with {old_name}"
-msgstr "substituido {new_name} por {old_name}"
-
-#: js/filelist.js:539
-msgid "undo"
-msgstr "desfazer"
-
-#: js/filelist.js:591
-msgid "Error deleting file."
-msgstr ""
-
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n pasta"
-msgstr[1] "%n pastas"
-
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n ficheiro"
-msgstr[1] "%n ficheiros"
-
-#: js/filelist.js:617
-msgid "{dirs} and {files}"
-msgstr "{dirs} e {files}"
-
-#: js/filelist.js:828 js/filelist.js:866
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
-msgstr[0] "A carregar %n ficheiro"
-msgstr[1] "A carregar %n ficheiros"
-
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' não é um nome de ficheiro válido!"
-
-#: js/files.js:81
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nome Inválido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
 
-#: js/files.js:93
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr "O nome %s já está em uso na pasta %s. Por favor escolha um nome diferente."
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr "Não é uma fonte válida"
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr "O servidor não consegue abrir URLs, por favor verifique a configuração do servidor"
+
+#: ajax/newfile.php:119
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr "Erro ao transferir %s para %s"
+
+#: ajax/newfile.php:156
+msgid "Error when creating the file"
+msgstr "Erro ao criar o ficheiro"
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr "O nome da pasta não pode estar vazio."
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr "Erro ao criar a pasta"
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr "Não foi possível criar o diretório de upload"
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr "Token inválido"
+
+#: ajax/upload.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
+
+#: ajax/upload.php:78
+msgid "There is no error, the file uploaded with success"
+msgstr "Não ocorreram erros, o ficheiro foi submetido com sucesso"
+
+#: ajax/upload.php:79
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize"
+
+#: ajax/upload.php:81
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "O tamanho do ficheiro carregado ultrapassa o valor MAX_FILE_SIZE definido no formulário HTML"
+
+#: ajax/upload.php:82
+msgid "The uploaded file was only partially uploaded"
+msgstr "O ficheiro seleccionado foi apenas carregado parcialmente"
+
+#: ajax/upload.php:83
+msgid "No file was uploaded"
+msgstr "Nenhum ficheiro foi submetido"
+
+#: ajax/upload.php:84
+msgid "Missing a temporary folder"
+msgstr "Está a faltar a pasta temporária"
+
+#: ajax/upload.php:85
+msgid "Failed to write to disk"
+msgstr "Falhou a escrita no disco"
+
+#: ajax/upload.php:103
+msgid "Not enough storage available"
+msgstr "Não há espaço suficiente em disco"
+
+#: ajax/upload.php:160
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Falhou o envio. Não conseguiu encontrar o ficheiro enviado"
+
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "O carregamento falhou. Não foi possível obter a informação do ficheiro."
+
+#: ajax/upload.php:189
+msgid "Invalid directory."
+msgstr "Directório Inválido"
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr "Ficheiros"
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes"
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
+msgid "Upload cancelled."
+msgstr "Envio cancelado."
+
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr "Não foi possível obter o resultado do servidor."
+
+#: js/file-upload.js:477
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Envio de ficheiro em progresso. Irá cancelar o envio se sair da página agora."
+
+#: js/file-upload.js:564
+msgid "URL cannot be empty"
+msgstr "URL não pode estar vazio"
+
+#: js/file-upload.js:568
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr "Na pasta pessoal \"Partilhado\" é um nome de ficheiro reservado"
+
+#: js/file-upload.js:570 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr "O nome {new_name} já existe"
+
+#: js/file-upload.js:636
+msgid "Could not create file"
+msgstr "Não pôde criar ficheiro"
+
+#: js/file-upload.js:652
+msgid "Could not create folder"
+msgstr "Não pôde criar pasta"
+
+#: js/file-upload.js:702
+msgid "Error fetching URL"
+msgstr "Erro ao obter URL"
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr "Partilhar"
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr "Eliminar permanentemente"
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr "Renomear"
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr "Pendente"
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr "Não pôde renomear o ficheiro"
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr "substituido {new_name} por {old_name}"
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr "desfazer"
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr "Erro ao apagar o ficheiro."
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n pasta"
+msgstr[1] "%n pastas"
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n ficheiro"
+msgstr[1] "%n ficheiros"
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr "{dirs} e {files}"
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "A carregar %n ficheiro"
+msgstr[1] "A carregar %n ficheiros"
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "O seu armazenamento está cheio, os ficheiros não podem ser sincronizados."
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "O seu espaço de armazenamento está quase cheiro ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "O seu download está a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Erro ao mover o ficheiro"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Erro"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificado"
 
 #: lib/app.php:60
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
-msgstr ""
+msgstr "Nome de pasta inválido. Utilização de \"Partilhado\" está reservada."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s não pode ser renomeada"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Carregar"
 
@@ -345,72 +353,68 @@ msgstr "Tamanho máximo para ficheiros ZIP"
 msgid "Save"
 msgstr "Guardar"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
-msgstr ""
+msgstr "Novo ficheiro de texto"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Ficheiro de texto"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nova Pasta"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Pasta"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Da ligação"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Ficheiros eliminados"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "Você não tem permissão para enviar ou criar ficheiros aqui"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envie alguma coisa!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Upload muito grande"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiro que está a tentar enviar excedem o tamanho máximo de envio neste servidor."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Análise actual"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Atualizar cache do sistema de ficheiros..."
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 05ab1951b2..182227a14f 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,18 +84,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Faltam alguns requisitos."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Os utilizadores seguintes não estão marcados para cifragem:"
 
@@ -103,9 +103,9 @@ msgstr "Os utilizadores seguintes não estão marcados para cifragem:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "A guardar..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 7cac3cf388..607236cb2e 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Mouxy <daniel@mouxy.net>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2014
+# jmruas <jmruas@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-21 10:30+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +20,44 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acesso autorizado"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Erro ao configurar o armazenamento do Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Conceder acesso"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Erro ao configurar o armazenamento do Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Guardado"
+
+#: lib/config.php:631
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Atenção:</b> O cliente \"smbclient\" não está instalado. Não é possível montar as partilhas CIFS/SMB . Peça ao seu administrador para instalar."
 
-#: lib/config.php:465
+#: lib/config.php:635
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Aviso:</b> O suporte FTP no PHP não está activate ou instalado. Não é possível montar as partilhas FTP. Peça ao seu administrador para instalar."
 
-#: lib/config.php:468
+#: lib/config.php:638
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +109,22 @@ msgid "Users"
 msgstr "Utilizadores"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Activar Armazenamento Externo para o Utilizador"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Permitir que os utilizadores montem o seu próprio armazenamento externo"
+msgid "Allow users to mount the following external storage"
+msgstr "Permitir que os utilizadores montem o seguinte armazenamento externo"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Certificados SSL de raiz"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importar Certificado Root"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 8f81ec4756..bd36354d94 100644
--- a/l10n/pt_PT/files_sharing.po
+++ b/l10n/pt_PT/files_sharing.po
@@ -4,16 +4,16 @@
 # 
 # Translators:
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
-# Helder Meneses <helder.meneses@gmail.com>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
 # moliveira <manuel.oliveira@gmail.com>, 2013
 # PapiMigas Migas <papimigas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: PapiMigas Migas <papimigas@gmail.com>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 16:10+0000\n"
+"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +21,10 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Partilhado por {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Esta partilha está protegida por palavra-chave"
@@ -57,32 +61,16 @@ msgstr "A partilha está desativada"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Para mais informações, por favor questione a pessoa que lhe enviou este link"
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s partilhou a pasta %s consigo"
+msgid "shared by %s"
+msgstr "partilhada por %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s partilhou o ficheiro %s consigo"
+msgid "Download %s"
+msgstr "Download %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Transferir"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Carregar"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Cancelar envio"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Não há pré-visualização para"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Link direto"
diff --git a/l10n/pt_PT/files_trashbin.po b/l10n/pt_PT/files_trashbin.po
index 08cb33d574..25f2d4d437 100644
--- a/l10n/pt_PT/files_trashbin.po
+++ b/l10n/pt_PT/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Não foi possível eliminar %s de forma permanente"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Não foi possível restaurar %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Ficheiros eliminados"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Erro"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "Restaurado"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Não hà ficheiros. O lixo está vazio!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nome"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Restaurar"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Apagado"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Ficheiros Apagados"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index aa1267bce6..d042b9424c 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Helder Meneses <helder.meneses@gmail.com>, 2013
+# jmruas <jmruas@gmail.com>, 2014
 # PapiMigas Migas <papimigas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-16 03:12-0400\n"
+"PO-Revision-Date: 2014-03-15 16:30+0000\n"
+"Last-Translator: jmruas <jmruas@gmail.com>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,38 +20,38 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "A aplicação \"%s\" não pode ser instaladas por não ser compatível com esta versão da ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "O nome da aplicação não foi especificado"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Ajuda"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Pessoal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Configurações"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Utilizadores"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "A actualização \"%s\" falhou."
@@ -63,15 +64,10 @@ msgstr "Ficheiro desconhecido"
 msgid "Invalid image"
 msgstr "Imagem inválida"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "serviços web sob o seu controlo"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "Não foi possível abrir \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Descarregamento em ZIP está desligado."
@@ -94,74 +90,78 @@ msgid ""
 "administrator."
 msgstr "Por favor descarregue os ficheiros divididos em partes mais pequenas ou peça ajuda ao seu administrador."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Não foi especificada uma fonte de instalação desta aplicação"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Não foi especificada uma href http para instalar esta aplicação"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Não foi especificado o caminho de instalação desta aplicação"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Arquivos do tipo %s não são suportados"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Ocorreu um erro ao abrir o ficheiro de instalação desta aplicação"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "A aplicação não disponibiliza um ficheiro info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "A aplicação não pode ser instalado devido a código não permitido dentro da aplicação"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "A aplicação não pode ser instalada por não ser compatível com esta versão do ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Esta aplicação não pode ser instalada por que contém o tag <shipped>true</shipped> que só é permitido para aplicações nativas"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Esta aplicação não pode ser instalada porque a versão no info.xml/version não coincide com a reportada na loja de aplicações"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "A directoria da aplicação já existe"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "A aplicação não está activada"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Erro na autenticação"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "O token expirou. Por favor recarregue a página."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Utilizador desconhecido"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Ficheiros"
@@ -195,23 +195,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Nome de utilizador/password do MySQL é inválido: %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 "Precisa de introduzir uma conta existente ou de administrador"
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Nome de utilizador/password do MySQL inválida"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: 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 "Erro na BD: \"%s\""
@@ -220,30 +220,30 @@ msgstr "Erro na BD: \"%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 "O comando gerador de erro foi: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "O utilizador '%s'@'localhost' do MySQL já existe."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Eliminar este utilizador do MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "O utilizador '%s'@'%%' do MySQL já existe"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Eliminar este utilizador do MySQL"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -258,7 +258,7 @@ msgstr "Nome de utilizador/password do Oracle inválida"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "O comando gerador de erro foi: \"%s\", nome: %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 "Nome de utilizador/password do PostgreSQL inválido"
 
@@ -270,66 +270,72 @@ msgstr "Definir um nome de utilizador de administrador"
 msgid "Set an admin password."
 msgstr "Definiar uma password de administrador"
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Por favor verifique <a href='%s'>installation guides</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s partilhado »%s« contigo"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Não foi encontrado a categoria \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "Minutos atrás"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n minutos atrás"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n horas atrás"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "hoje"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ontem"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n dias atrás"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "ultímo mês"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n meses atrás"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "ano passado"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "anos atrás"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index d92800eab3..3879c7118d 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -7,15 +7,16 @@
 # Mouxy <daniel@mouxy.net>, 2013
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2013
 # Helder Meneses <helder.meneses@gmail.com>, 2013
+# jmruas <jmruas@gmail.com>, 2014
 # Nelson Rosado <nelsontrosado@gmail.com>, 2013
 # PapiMigas Migas <papimigas@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-13 14:43-0500\n"
-"PO-Revision-Date: 2013-12-12 10:40+0000\n"
-"Last-Translator: Helder Meneses <helder.meneses@gmail.com>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,6 +24,48 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Guardado"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "testar configurações de email"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-mail enviado"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Modo de envio"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Encriptação"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Incapaz de carregar a lista da App Store"
@@ -119,62 +162,90 @@ msgstr "Não foi possível alterar a sua palavra-passe, mas a chave de encripta
 msgid "Unable to change password"
 msgstr "Não foi possível alterar a sua password"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "A enviar..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Documentação de Utilizador"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Actualizar para a versão {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Desactivar"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Activar"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Por favor aguarde..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Erro enquanto desactivava a aplicação"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Erro enquanto activava a aplicação"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "A Actualizar..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Erro enquanto actualizava a aplicação"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Erro"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Actualizar"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Actualizado"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Seleccione uma fotografia de perfil"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "A guardar..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "apagado"
@@ -187,40 +258,40 @@ msgstr "desfazer"
 msgid "Unable to remove user"
 msgstr "Não foi possível remover o utilizador"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupos"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "Adicionar grupo"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Um nome de utilizador válido deve ser fornecido"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Erro a criar utilizador"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Uma password válida deve ser fornecida"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Atenção: a pasta pessoal do utilizador \"{user}\" já existe"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -244,18 +315,42 @@ msgstr "Erros e problemas fatais"
 msgid "Fatal issues only"
 msgstr "Apenas problemas fatais"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Nenhum"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Login"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Aviso de Segurança"
 
-#: templates/admin.php:25
+#: 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 "Está a aceder %s via HTTP. Recomendamos vivamente que configure o servidor para forçar o uso de HTTPS."
 
-#: templates/admin.php:39
+#: 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 "
@@ -264,68 +359,68 @@ msgid ""
 "root."
 msgstr "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Aviso de setup"
 
-#: templates/admin.php:53
+#: 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 "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Por favor verifique o<a href='%s'>Guia de instalação</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Falta o módulo 'fileinfo'"
 
-#: templates/admin.php:68
+#: 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 "O Módulo PHP 'fileinfo' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "A sua versão do PHP está ultrapassada"
 
-#: templates/admin.php:82
+#: 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 "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido às versões anteriores conterem problemas. É também possível que esta instalação não esteja a funcionar correctamente."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Internacionalização não está a funcionar"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Não é possível pôr as definições de sistema compatíveis com UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros."
 
-#: templates/admin.php:106
+#: 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 "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "A ligação à internet não está a funcionar"
 
-#: templates/admin.php:121
+#: 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 "
@@ -334,118 +429,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Executar uma tarefa com cada página carregada"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php está registado num serviço webcron para chamar a página cron.php por http a cada 15 minutos."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Use o serviço cron do sistema para chamar o ficheiro cron.php a cada 15 minutos."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Partilha"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activar a API de partilha"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Permitir que os utilizadores usem a API de partilha"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Permitir links"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir que os utilizadores partilhem itens com o público utilizando um link."
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permitir Envios Públicos"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Permitir aos utilizadores que possam definir outros utilizadores para carregar ficheiros para as suas pastas publicas"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permitir repartilha"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir que os utilizadores partilhem itens partilhados com eles"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permitir que os utilizadores partilhem com todos"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir que os utilizadores partilhem somente com utilizadores do seu grupo"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Permitir notificação por email"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Permitir que o utilizador envie notificações por correio electrónico para ficheiros partilhados"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Segurança"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Forçar HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Forçar os clientes a ligar a %s através de uma ligação encriptada"
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL"
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Servidor de email"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Isto é utilizado para enviar notificações"
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Do endereço"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Autenticação necessária"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Endereço do servidor"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Porto"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Credenciais"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "Nome de utilizador SMTP"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "Password SMTP"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Testar configurações de email"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Enviar email"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Registo"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nível do registo"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mais"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menos"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versão"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -455,30 +610,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Adicione a sua aplicação"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Mais Aplicações"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Selecione uma aplicação"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Documentação:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver a página da aplicação em apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Ver site da aplicação"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Documentação de Utilizador"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentação de administrador."
@@ -512,7 +671,7 @@ msgstr "Mostrar novamente Wizard de Arranque Inicial"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Usou <strong>%s</strong> do disponivel <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Password"
 
@@ -524,151 +683,149 @@ msgstr "A sua palavra-passe foi alterada"
 msgid "Unable to change your password"
 msgstr "Não foi possivel alterar a sua palavra-chave"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Palavra-chave actual"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nova palavra-chave"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Alterar palavra-chave"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "O seu endereço de email"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Foto do perfil"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Carregar novo"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Seleccionar novo a partir dos ficheiros"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Remover imagem"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Apenas png ou jpg. Idealmente quadrada, mas poderá corta-la depois."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "O seu avatar é fornecido pela sua conta original."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Abortar"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Escolha uma fotografia de perfil"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Idioma"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Ajude a traduzir"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Encriptação"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Password de entrada"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Desencriptar todos os ficheiros"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Nome de utilizador"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Criar"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Recuperar password de administrador"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Armazenamento Padrão"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nome de utilizador"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "alterar nome completo"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "definir nova palavra-passe"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Padrão"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 048fb54948..98b0514191 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Bruno Martins <brunomomartins@gmail.com>, 2013
+# Bruno Martins <inactive+skorzen@transifex.com>, 2013
+# Carlos <crolidge@gmail.com>, 2014
 # Mouxy <daniel@mouxy.net>, 2013
-# Helder Meneses <helder.meneses@gmail.com>, 2013
+# Helder Meneses <helder.meneses@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +27,7 @@ msgstr "Falhou a limpar os mapas"
 
 #: ajax/deleteConfiguration.php:34
 msgid "Failed to delete the server configuration"
-msgstr "Erro ao eliminar as configurações do servidor"
+msgstr "Erro ao eliminar a configuração do servidor"
 
 #: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
@@ -46,20 +47,20 @@ msgstr ""
 
 #: ajax/wizard.php:32
 msgid "No action specified"
-msgstr ""
+msgstr "Nenhuma acção especificada"
 
 #: ajax/wizard.php:38
 msgid "No configuration specified"
-msgstr ""
+msgstr "Nenhuma configuração especificada"
 
 #: ajax/wizard.php:81
 msgid "No data specified"
-msgstr ""
+msgstr "Nenhuma data especificada"
 
 #: ajax/wizard.php:89
 #, php-format
 msgid " Could not set configuration %s"
-msgstr ""
+msgstr "Não foi possível definir a configuração %s"
 
 #: js/settings.js:67
 msgid "Deletion failed"
@@ -89,43 +90,43 @@ msgstr "Sucesso"
 msgid "Error"
 msgstr "Erro"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
-msgstr ""
+msgstr "Configuração OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
-msgstr ""
+msgstr "Configuração incorreta"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
-msgstr ""
+msgstr "Configuração incompleta"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Seleccionar grupos"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
-msgstr ""
+msgstr "Selecionar classes de objetos"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
-msgstr ""
+msgstr "Selecionar atributos"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Teste de conecção passado com sucesso."
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Erro no teste de conecção."
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Deseja realmente apagar as configurações de servidor actuais?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Confirmar a operação de apagar"
 
@@ -133,23 +134,23 @@ msgstr "Confirmar a operação de apagar"
 #, php-format
 msgid "%s group found"
 msgid_plural "%s groups found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s grupo encontrado"
+msgstr[1] "%s grupos encontrados"
 
 #: lib/wizard.php:122
 #, php-format
 msgid "%s user found"
 msgid_plural "%s users found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s utilizador encontrado"
+msgstr[1] "%s utilizadores encontrados"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
-msgstr ""
+msgstr "Hospedeiro Inválido"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
-msgstr ""
+msgstr "Não se encontrou a função desejada"
 
 #: templates/part.settingcontrols.php:2
 msgid "Save"
@@ -165,63 +166,63 @@ msgstr "Ajuda"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
 msgid "only those object classes:"
-msgstr ""
+msgstr "apenas essas classes de objetos:"
 
 #: templates/part.wizard-groupfilter.php:17
 #: templates/part.wizard-userfilter.php:17
 msgid "only from those groups:"
-msgstr ""
+msgstr "apenas desses grupos:"
 
 #: templates/part.wizard-groupfilter.php:25
 #: templates/part.wizard-loginfilter.php:32
 #: templates/part.wizard-userfilter.php:25
 msgid "Edit raw filter instead"
-msgstr ""
+msgstr "Editar filtro raw em vez disso"
 
 #: templates/part.wizard-groupfilter.php:30
 #: templates/part.wizard-loginfilter.php:37
 #: templates/part.wizard-userfilter.php:30
 msgid "Raw LDAP filter"
-msgstr ""
+msgstr "Filtro LDAP Raw"
 
 #: templates/part.wizard-groupfilter.php:31
 #, php-format
 msgid ""
 "The filter specifies which LDAP groups shall have access to the %s instance."
-msgstr ""
+msgstr "O filtro especifica quais grupos LDAP devem ter acesso à instância %s."
 
 #: templates/part.wizard-groupfilter.php:38
 msgid "groups found"
-msgstr ""
+msgstr "grupos encontrados"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
-msgstr ""
+msgstr "Nome de utilizador LDAP:"
 
 #: templates/part.wizard-loginfilter.php:16
 msgid "LDAP Email Address:"
-msgstr ""
+msgstr "Endereço de correio eletrónico LDAP:"
 
 #: templates/part.wizard-loginfilter.php:24
 msgid "Other Attributes:"
-msgstr ""
+msgstr "Outros Atributos:"
 
 #: templates/part.wizard-loginfilter.php:38
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr ""
+msgstr "Define o filtro a aplicar, quando se tenta uma sessão. %%uid substitui o nome de utilizador na ação de início de sessão. Exemplo: \"uid=%%uid\""
 
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
@@ -269,7 +270,7 @@ msgstr "Pode especificar o ND Base para utilizadores e grupos no separador Avan
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -280,7 +281,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:38
 msgid "users found"
-msgstr ""
+msgstr "utilizadores encontrados"
 
 #: templates/part.wizardcontrols.php:5
 msgid "Back"
@@ -295,7 +296,7 @@ msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
 " experience unexpected behavior. Please ask your system administrator to "
 "disable one of them."
-msgstr ""
+msgstr "<b>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações."
 
 #: templates/settings.php:14
 msgid ""
@@ -335,7 +336,7 @@ msgstr "Desactivar servidor principal"
 
 #: templates/settings.php:25
 msgid "Only connect to the replica server."
-msgstr ""
+msgstr "Ligar apenas ao servidor de réplicas."
 
 #: templates/settings.php:26
 msgid "Case insensitve LDAP server (Windows)"
@@ -370,7 +371,7 @@ msgstr "Mostrador do nome de utilizador."
 
 #: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
+msgstr "Atributo LDAP para gerar o nome de utilizador do ownCloud."
 
 #: templates/settings.php:33
 msgid "Base User Tree"
@@ -394,7 +395,7 @@ msgstr "Mostrador do nome do grupo."
 
 #: templates/settings.php:35
 msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
+msgstr "Atributo LDAP para gerar o nome do grupo do ownCloud."
 
 #: templates/settings.php:36
 msgid "Base Group Tree"
@@ -412,41 +413,51 @@ msgstr "Atributos de pesquisa de grupo"
 msgid "Group-Member association"
 msgstr "Associar utilizador ao grupo."
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Atributos especiais"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Quota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Quota padrão"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Campo de email"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Regra da pasta inicial do utilizador"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Nome de utilizador interno"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -460,17 +471,17 @@ msgid ""
 "behavior as before ownCloud 5 enter the user display name attribute in the "
 "following field. Leave it empty for default behavior. Changes will have "
 "effect only on newly mapped (added) LDAP users."
-msgstr ""
+msgstr "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres não necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituídos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para utilizadores mapeados (adicionados) LDAP."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atributo do nome de utilizador interno"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Passar a detecção do UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -481,19 +492,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
-msgid "UUID Attribute for Users:"
-msgstr ""
-
 #: templates/settings.php:57
-msgid "UUID Attribute for Groups:"
-msgstr ""
+msgid "UUID Attribute for Users:"
+msgstr "Atributo UUID para utilizadores:"
 
 #: templates/settings.php:58
+msgid "UUID Attribute for Groups:"
+msgstr "Atributo UUID para grupos:"
+
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Mapeamento do utilizador LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -507,10 +518,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Limpar mapeamento do utilizador-LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Limpar o mapeamento do nome de grupo LDAP"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index f2ee984065..970eadbc86 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,12 +21,11 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s Partajat »%s« cu tine de"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -43,19 +42,6 @@ msgstr ""
 msgid "Updated database"
 msgstr "Bază de date actualizată"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -76,139 +62,143 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Duminică"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Luni"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Marți"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Joi"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Vineri"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Ianuarie"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februarie"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Martie"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Aprilie"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mai"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Iunie"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Iulie"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Septembrie"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Octombrie"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Noiembrie"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Decembrie"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Setări"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Se salvează..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "acum %n minut"
 msgstr[1] "acum %n minute"
 msgstr[2] "acum %n minute"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "acum %n oră"
 msgstr[1] "acum %n ore"
 msgstr[2] "acum %n ore"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "astăzi"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "acum %n zi"
 msgstr[1] "acum %n zile"
 msgstr[2] "acum %n zile"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "luni în urmă"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "ani în urmă"
 
@@ -277,6 +267,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Partajat"
@@ -285,12 +295,12 @@ msgstr "Partajat"
 msgid "Share"
 msgstr "Partajează"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Eroare"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
@@ -302,123 +312,123 @@ msgstr "Eroare la anularea partajării"
 msgid "Error while changing permissions"
 msgstr "Eroare la modificarea permisiunilor"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Distribuie cu tine si grupul {group} de {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Distribuie cu tine de {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Parolă"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Permiteţi încărcarea publică."
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Expediază legătura prin poșta electronică"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Expediază"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Specifică data expirării"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Data expirării"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Distribuie prin email:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Nici o persoană găsită"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Repartajarea nu este permisă"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Distribuie in {item} si {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Anulare partajare"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "poate edita"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "control acces"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "actualizare"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "ștergere"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "partajare"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Se expediază..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Mesajul a fost expediat"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Atenție"
 
@@ -465,11 +475,17 @@ msgstr "Actualizarea a eșuat! Raportați problema către <a href=\"https://gith
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Actualizare reușită. Ești redirecționat către ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Folosește următorul link pentru a reseta parola: {link}"
@@ -489,8 +505,8 @@ msgstr "Cerere esuata!<br>Esti sigur ca email-ul/numele de utilizator sunt corec
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vei primi un mesaj prin care vei putea reseta parola via email."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Nume utilizator"
 
@@ -526,6 +542,18 @@ msgstr "Noua parolă"
 msgid "Reset password"
 msgstr "Resetează parola"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personal"
@@ -534,7 +562,7 @@ msgstr "Personal"
 msgid "Users"
 msgstr "Utilizatori"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplicații"
 
@@ -644,49 +672,47 @@ msgstr "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crează un <strong>cont de administrator</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avansat"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Director date"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Configurează baza de date"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "vor fi folosite"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Utilizatorul bazei de date"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Parola bazei de date"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Numele bazei de date"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tabela de spațiu a bazei de date"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Bază date"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -702,7 +728,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s este disponibil. Vezi mai multe informații despre procesul de actualizare."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Ieșire"
 
@@ -728,27 +754,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Ai uitat parola?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "amintește"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Autentificare"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Conectări alternative"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 7d9acd7661..f4def01082 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,6 +3,8 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# andreiacob <andrei.iacob@y7mail.com>, 2014
+# roentgen <arthur.titeica@gmail.com>, 2014
 # corneliu.e <corneliueva@yahoo.com>, 2013
 # dimaursu16 <dima@ceata.org>, 2013
 # inaina <ina.c.ina@gmail.com>, 2013
@@ -12,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,286 +24,293 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "%s nu se poate muta - Fișierul cu acest nume există deja "
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
-msgstr "Nu s-a putut muta %s"
+msgstr "Nu se poate muta %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Numele fișierului nu poate rămâne gol."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nume nevalide, '\\', '/', '<', '>', ':', '\"', '|', '?' și '*' nu sunt permise."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
-msgstr ""
+msgstr "Eroare la crearea fisierului"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
-msgstr ""
+msgstr "Eroare la crearea folderului"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Imposibil de a seta directorul pentru incărcare."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Jeton Invalid"
 
-#: ajax/upload.php:64
-msgid "No file was uploaded. Unknown error"
-msgstr "Nici un fișier nu a fost încărcat. Eroare necunoscută"
-
 #: ajax/upload.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr "Niciun fișier nu a fost încărcat. Eroare necunoscută"
+
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Fisierul incarcat depaseste marimea maxima permisa in php.ini: "
+msgstr "Fișierul încărcat depășește directiva upload_max_filesize din php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Fișierul are o dimensiune mai mare decât variabile MAX_FILE_SIZE specificată în formularul HTML"
+msgstr "Fișierul încărcat depășește directiva MAX_FILE_SIZE specificată în formularul HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fișierul a fost încărcat doar parțial"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
-msgstr "Nu a fost încărcat nici un fișier"
+msgstr "Nu a fost încărcat niciun fișier"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Lipsește un dosar temporar"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
-msgstr "Eroare la scrierea discului"
+msgstr "Eroare la scrierea pe disc"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
-msgstr "Nu este suficient spațiu disponibil"
+msgstr "Nu este disponibil suficient spațiu"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Încărcare eșuată. Nu se pot obține informații despre fișier."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Încărcare eșuată. Nu se poate găsi fișierul încărcat"
 
-#: ajax/upload.php:172
-msgid "Invalid directory."
-msgstr "registru invalid."
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Încărcare eșuată. Nu se pot obține informații despre fișier."
 
-#: appinfo/app.php:11
+#: ajax/upload.php:189
+msgid "Invalid directory."
+msgstr "Dosar nevalid."
+
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Fișiere"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Nu este suficient spațiu disponibil"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Încărcare anulată."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Nu se poate obține rezultatul de la server."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
-msgstr ""
+msgstr "URL nu poate fi gol"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
-msgstr "{new_name} deja exista"
+msgstr "{new_name} există deja"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
-msgstr ""
+msgstr "Nu s-a putut crea fisierul"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
-msgstr ""
+msgstr "Nu s-a putut crea folderul"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
-msgstr "a imparti"
+msgstr "Partajează"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
-msgstr "Stergere permanenta"
+msgstr "Șterge permanent"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
-msgstr "Redenumire"
+msgstr "Redenumește"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
-msgstr "in timpul"
+msgstr "În așteptare"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
-msgstr ""
-
-#: js/filelist.js:539
-msgid "replaced {new_name} with {old_name}"
-msgstr "{new_name} inlocuit cu {old_name}"
-
-#: js/filelist.js:539
-msgid "undo"
-msgstr "Anulează ultima acțiune"
+msgstr "Nu s-a putut redenumi fisierul"
 
 #: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr "{new_name} a fost înlocuit cu {old_name}"
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr "desfă"
+
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n director"
 msgstr[1] "%n directoare"
 msgstr[2] "%n directoare"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fișier"
 msgstr[1] "%n fișiere"
 msgstr[2] "%n fișiere"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} și {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Se încarcă %n fișier."
 msgstr[1] "Se încarcă %n fișiere."
 msgstr[2] "Se încarcă %n fișiere."
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' este un nume invalid de fișier."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nume invalide, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Spatiul de stocare este plin, fisierele nu mai pot fi actualizate sau sincronizate"
+msgstr "Spațiul de stocare este plin, fișierele nu mai pot fi actualizate sau sincronizate!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr "Spatiul de stocare este aproape plin {spatiu folosit}%"
+msgstr "Spațiul de stocare este aproape plin ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele"
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "in curs de descarcare. Aceasta poate să dureze ceva timp dacă fișierele sunt mari."
+msgstr "Se pregătește descărcarea. Aceasta poate dura ceva timp dacă fișierele sunt mari."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Eroare la mutarea fișierului"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Eroare"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
-msgstr "Dimensiune"
+msgstr "Mărime"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Modificat"
 
@@ -309,14 +318,14 @@ msgstr "Modificat"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nu a putut fi redenumit"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
-msgstr "Încărcare"
+msgstr "Încărcă"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -332,90 +341,86 @@ msgstr "max. posibil:"
 
 #: templates/admin.php:15
 msgid "Needed for multi-file and folder downloads."
-msgstr "necesar la descarcarea mai multor liste si fisiere"
+msgstr "Necesar pentru descărcarea mai multor fișiere și a dosarelor."
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
-msgstr "permite descarcarea codurilor ZIP"
+msgstr "Permite descărcarea ZIP"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
-msgstr "0 e nelimitat"
+msgstr "0 este nelimitat"
 
 #: templates/admin.php:22
 msgid "Maximum input size for ZIP files"
-msgstr "Dimensiunea maximă de intrare pentru fișiere compresate"
+msgstr "Dimensiunea maximă de intrare pentru fișierele ZIP"
 
 #: templates/admin.php:26
 msgid "Save"
 msgstr "Salvează"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nou"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
-msgid "Text file"
-msgstr "lista"
-
 #: templates/index.php:10
+msgid "Text file"
+msgstr "Fișier text"
+
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Dosar"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
-msgstr "de la adresa"
+msgstr "De la adresa"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
-msgstr "Sterge fisierele"
+msgstr "Fișiere șterse"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Anulează încărcarea"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "Nu aveti permisiunea de a incarca sau crea fisiere aici"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. Încarcă ceva!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Fișierul încărcat este prea mare"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
+msgstr "Fișierele pe care încerci să le încarci depășesc limita de încărcare maximă admisă pe acest server."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
-msgstr "Fișierele sunt scanate, asteptati va rog"
+msgstr "Fișierele sunt scanate, te rog așteaptă."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "În curs de scanare"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Modernizare fisiere de sistem cache.."
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 2c475db5a0..69ab253275 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# DaniR <dani@chance.ro>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,39 +20,39 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Cheia de recupeare a fost activata cu succes"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nu s-a putut activa cheia de recuperare. Verifica parola de recuperare!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Cheia de recuperare dezactivata cu succes"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Nu am putut dezactiva cheia de recuperare. Verifica parola de recuperare!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
-msgstr ""
+msgstr "Parola a fost modificată cu succes."
 
 #: ajax/changeRecoveryPassword.php:51
 msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
+msgstr "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta."
 
 #: ajax/updatePrivateKeyPassword.php:52
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Cheia privata a fost actualizata cu succes"
 
 #: ajax/updatePrivateKeyPassword.php:54
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta."
 
 #: files/error.php:12
 msgid ""
@@ -80,18 +81,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +100,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Se salvează..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
@@ -109,7 +110,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
-msgstr ""
+msgstr "setari personale"
 
 #: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
@@ -130,11 +131,11 @@ msgstr ""
 
 #: templates/settings-admin.php:21 templates/settings-personal.php:51
 msgid "Enabled"
-msgstr ""
+msgstr "Activat"
 
 #: templates/settings-admin.php:29 templates/settings-personal.php:59
 msgid "Disabled"
-msgstr ""
+msgstr "Dezactivat"
 
 #: templates/settings-admin.php:34
 msgid "Change recovery key password:"
@@ -154,11 +155,11 @@ msgstr ""
 
 #: templates/settings-admin.php:58
 msgid "Change Password"
-msgstr ""
+msgstr "Schimbă parola"
 
 #: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Parola cheii private nu se mai potriveste cu parola ta de logare:"
 
 #: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
@@ -194,8 +195,8 @@ msgstr ""
 
 #: templates/settings-personal.php:60
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Setarile pentru recuperarea fisierelor au fost actualizate"
 
 #: templates/settings-personal.php:61
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Nu am putut actualiza recuperarea de fisiere"
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index 69aa8b63bc..138c6c5ba8 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# roentgen <arthur.titeica@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 15:41+0000\n"
+"Last-Translator: roentgen <arthur.titeica@gmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +18,44 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Acces permis"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Eroare la configurarea mediului de stocare Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Permite accesul"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Prezintă te rog o cheie de Dropbox validă și parola"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Eroare la configurarea mediului de stocare Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Salvat"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Atenție:</b> \"smbclient\" nu este instalat. Montarea mediilor CIFS/SMB partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleaze."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Atenție:</b> suportul pentru FTP în PHP nu este activat sau instalat. Montarea mediilor FPT partajate nu este posibilă. Solicită administratorului sistemului tău să îl instaleze."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +107,22 @@ msgid "Users"
 msgstr "Utilizatori"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Permite stocare externă pentru utilizatori"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Permite utilizatorilor să monteze stocare externă proprie"
+msgid "Allow users to mount the following external storage"
+msgstr "Permite utilizatorilor să monteze următoarea unitate de stocare"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Certificate SSL root"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importă certificat root"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index f5960b814f..f7f4f9bc0f 100644
--- a/l10n/ro/files_sharing.po
+++ b/l10n/ro/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -54,32 +58,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s a partajat directorul %s cu tine"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s a partajat fișierul %s cu tine"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Descarcă"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Încărcare"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Anulează încărcarea"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Nici o previzualizare disponibilă pentru "
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ro/files_trashbin.po b/l10n/ro/files_trashbin.po
index ca45c2337b..c94d2142b5 100644
--- a/l10n/ro/files_trashbin.po
+++ b/l10n/ro/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 16:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Sterge fisierele"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Eroare"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Nume"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 38e5a85313..f53e445c72 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# I Robot <owncloud-bot@tmit.eu>, 2013
+# I Robot, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Ajutor"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personal"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Setări"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Utilizatori"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -62,15 +62,10 @@ msgstr "Tip fișier necunoscut"
 msgid "Invalid image"
 msgstr "Imagine invalidă"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Descărcarea ZIP este dezactivată."
@@ -93,74 +88,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Aplicația nu este activată"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Eroare la autentificare"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token expirat. Te rugăm să reîncarci pagina."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Fișiere"
@@ -200,7 +199,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -228,20 +227,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -269,70 +268,76 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s Partajat »%s« cu tine de"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Cloud nu a gasit categoria \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "acum %n minute"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "acum %n ore"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "astăzi"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ieri"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "acum %n zile"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "ultima lună"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "ultimul an"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "ani în urmă"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 4841638de4..788adc850f 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,48 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Salvat"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Mesajul a fost expediat"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Încriptare"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Imposibil de actualizat lista din  App Store."
@@ -115,61 +157,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr "Imposibil de schimbat parola"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Documentație utilizator"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Actualizat la {versiuneaaplicaţiei}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Dezactivați"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Activare"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Aşteptaţi vă rog...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Actualizare în curs...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Eroare în timpul actualizării aplicaţiei"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Eroare"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Actualizare"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Actualizat"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Se salvează..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -183,40 +253,40 @@ msgstr "Anulează ultima acțiune"
 msgid "Unable to remove user"
 msgstr "Imposibil de eliminat utilizatorul"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupuri"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupul Admin "
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Șterge"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "adăugaţi grupul"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Trebuie să furnizaţi un nume de utilizator valid"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Eroare la crearea utilizatorului"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Trebuie să furnizaţi o parolă validă"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "_language_name_"
 
@@ -240,18 +310,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Niciuna"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Autentificare"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Avertisment de securitate"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -260,68 +354,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Atenţie la implementare"
 
-#: templates/admin.php:53
+#: 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 "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modulul \"Fileinfo\" lipsește"
 
-#: templates/admin.php:68
+#: 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 "Modulul PHP \"Fileinfo\" lipsește. Va recomandam sa activaţi acest modul pentru a obține cele mai bune rezultate cu detectarea mime-type."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Localizarea nu funcționează"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Conexiunea la internet nu funcționează"
 
-#: templates/admin.php:121
+#: 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 "
@@ -330,118 +424,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Execută o sarcină la fiecare pagină încărcată"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Partajare"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Activare API partajare"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Permite aplicațiilor să folosească API-ul de partajare"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Pemite legături"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Permite utilizatorilor să partajeze fișiere în mod public prin legături"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Permite încărcări publice"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Permite repartajarea"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Permite utilizatorilor să repartajeze fișiere partajate cu ei"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Permite utilizatorilor să partajeze cu oricine"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Permite utilizatorilor să partajeze doar cu utilizatori din același grup"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Securitate"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Adresa server-ului"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Portul"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivel jurnal"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mai mult"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mai puțin"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versiunea"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -451,30 +605,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Adaugă aplicația ta"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Mai multe aplicații"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Selectează o aplicație"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Vizualizează pagina applicației pe apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Documentație utilizator"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Documentație administrator"
@@ -508,7 +666,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Parolă"
 
@@ -520,151 +678,149 @@ msgstr "Parola a fost modificată"
 msgid "Unable to change your password"
 msgstr "Imposibil de-ați schimbat parola"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Parola curentă"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Noua parolă"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Schimbă parola"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Adresa ta de email"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Completează o adresă de mail pentru a-ți putea recupera parola"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Imagine de profil"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Înlătură imagine"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Anulare"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Alege drept imagine de profil"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Limba"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Ajută la traducere"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Încriptare"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "Autentificare"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Crează"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Stocare implicită"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Nelimitată"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Altele"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Nume utilizator"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Stocare"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "setează parolă nouă"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Implicită"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 9edb1afcd3..a209336d3d 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "Succes"
 msgid "Error"
 msgstr "Eroare"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr "Ajutor"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -200,7 +200,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -268,7 +268,7 @@ msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -411,41 +411,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr "Asocierea Grup-Membru"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "în octeți"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index e1f8d17842..fec52335de 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -10,9 +10,10 @@
 # Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
 # jekader <jekader@gmail.com>, 2013
 # Mescalinich <insider.junk@gmail.com>, 2013
-# stushev <s-tushev@ya.ru>, 2013
+# stushev, 2013
 # eurekafag <rkfg@rkfg.me>, 2013
 # sk.avenger <sk.avenger@adygnet.ru>, 2013
+# Swab <swab@i.ua>, 2014
 # Victor Bravo <>, 2013
 # vsapronov <vladimir.sapronov@gmail.com>, 2013
 # not_your_conscience <hex.void@gmail.com>, 2013
@@ -23,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-24 01:55-0500\n"
-"PO-Revision-Date: 2013-12-22 17:10+0000\n"
-"Last-Translator: Evgeniy Spitsyn <evgeniy@spitsyn.net>\n"
+"POT-Creation-Date: 2014-03-28 01:55-0400\n"
+"PO-Revision-Date: 2014-03-27 14:31+0000\n"
+"Last-Translator: Swab <swab@i.ua>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,12 +34,11 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s поделился »%s« с вами"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "Дата истечения срока действия в прошлом."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Невозможно отправить письмо следующим пользователям: %s"
@@ -55,19 +55,6 @@ msgstr "Режим отладки отключён"
 msgid "Updated database"
 msgstr "База данных обновлена"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Обновление файлового кэша, это может занять некоторое время..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Обновлен файловый кэш"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% завершено ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Не указано изображение или файл"
@@ -88,139 +75,143 @@ msgstr "Временная картинка профиля недоступна,
 msgid "No crop data provided"
 msgstr "Не указана информация о кадрировании"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Понедельник"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Среда"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Четверг"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Пятница"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Суббота"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Январь"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Февраль"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Апрель"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Май"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Июнь"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Июль"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Сентябрь"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Октябрь"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Ноябрь"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Декабрь"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Конфигурация"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Сохранение..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "несколько секунд назад"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n минуту назад"
 msgstr[1] "%n минуты назад"
 msgstr[2] "%n минут назад"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n час назад"
 msgstr[1] "%n часа назад"
 msgstr[2] "%n часов назад"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "сегодня"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n день назад"
 msgstr[1] "%n дня назад"
 msgstr[2] "%n дней назад"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n месяц назад"
 msgstr[1] "%n месяца назад"
 msgstr[2] "%n месяцев назад"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "несколько месяцев назад"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "несколько лет назад"
 
@@ -289,6 +280,26 @@ msgstr "({count} выбрано)"
 msgid "Error loading file exists template"
 msgstr "Ошибка при загрузке шаблона существующего файла"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Очень слабый пароль"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Слабый пароль"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Так себе пароль"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Хороший пароль"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Устойчивый к взлому пароль"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Общие"
@@ -297,12 +308,12 @@ msgstr "Общие"
 msgid "Share"
 msgstr "Открыть доступ"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Ошибка при открытии доступа"
 
@@ -314,123 +325,123 @@ msgstr "Ошибка при закрытии доступа"
 msgid "Error while changing permissions"
 msgstr "Ошибка при смене разрешений"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} открыл доступ для Вас и группы {group} "
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner} открыл доступ для Вас"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Поделиться с пользователем или группой..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Поделиться ссылкой"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Защитить паролем"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Пароль"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Разрешить открытую загрузку"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Почтовая ссылка на персону"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Отправить"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Установить срок доступа"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Дата окончания"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Поделится через электронную почту:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Ни один человек не найден"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "группа"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Общий доступ не разрешен"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Общий доступ к {item} с {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Закрыть общий доступ"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "уведомить по почте"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "может редактировать"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "контроль доступа"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "создать"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "обновить"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "удалить"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "открыть доступ"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Защищено паролем"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Ошибка при отмене срока доступа"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Ошибка при установке срока доступа"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Отправляется ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Письмо отправлено"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -477,11 +488,17 @@ msgstr "При обновлении произошла ошибка. Пожал
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud..."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s сброс пароля"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Произошла ошибка при отправке сообщения электронной почты, пожалуйста, свяжитесь с Вашим администратором."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Используйте следующую ссылку чтобы сбросить пароль: {link}"
@@ -501,8 +518,8 @@ msgstr "Запрос не удался. Вы уверены, что email или
 msgid "You will receive a link to reset your password via Email."
 msgstr "На ваш адрес Email выслана ссылка для сброса пароля."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Имя пользователя"
 
@@ -538,6 +555,18 @@ msgstr "Новый пароль"
 msgid "Reset password"
 msgstr "Сбросить пароль"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Личное"
@@ -546,7 +575,7 @@ msgstr "Личное"
 msgid "Users"
 msgstr "Пользователи"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Приложения"
 
@@ -656,49 +685,47 @@ msgstr "Для информации, как правильно настроит
 msgid "Create an <strong>admin account</strong>"
 msgstr "Создать <strong>учётную запись администратора</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Дополнительно"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Система хранения данных & база данных"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Директория с данными"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Настройка базы данных"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "будет использовано"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Пользователь базы данных"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Пароль базы данных"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Название базы данных"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Табличое пространство базы данных"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Хост базы данных"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Завершить установку"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Завершаем..."
 
@@ -714,7 +741,7 @@ msgstr "Это приложение требует включённый JavaScri
 msgid "%s is available. Get more information on how to update."
 msgstr "%s доступно. Получить дополнительную информацию о порядке обновления."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Выйти"
 
@@ -740,28 +767,28 @@ msgstr "Неудачная аутентификация с сервером!"
 msgid "Please contact your administrator."
 msgstr "Пожалуйста, свяжитесь с вашим администратором."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Забыли пароль?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "запомнить"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Войти"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Альтернативные имена пользователя"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Здравствуйте,<br><br>просто даём вам знать, что %s расшарил %s для вас.<br><a href=\"%s\">Посмотреть!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Здравствуйте,<br><br>просто даём вам знать, что %s открыл доступ к %s для вас.<br><a href=\"%s\">Посмотреть!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 71eb028f58..4b5c985dfc 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -6,7 +6,9 @@
 # lord93 <lordakryl@gmail.com>, 2013
 # Evgeniy Spitsyn <evgeniy@spitsyn.net>, 2013
 # jekader <jekader@gmail.com>, 2013
+# mogarych <mogarych@mail.ru>, 2014
 # eurekafag <rkfg@rkfg.me>, 2013
+# Swab <swab@i.ua>, 2014
 # Victor Bravo <>, 2013
 # vsapronov <vladimir.sapronov@gmail.com>, 2013
 # not_your_conscience <hex.void@gmail.com>, 2013
@@ -17,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-24 01:55-0500\n"
-"PO-Revision-Date: 2013-12-22 17:50+0000\n"
-"Last-Translator: Evgeniy Spitsyn <evgeniy@spitsyn.net>\n"
+"POT-Creation-Date: 2014-03-28 01:55-0400\n"
+"PO-Revision-Date: 2014-03-27 14:22+0000\n"
+"Last-Translator: Swab <swab@i.ua>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,299 +29,306 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Невозможно переместить %s - файл с таким именем уже существует"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Невозможно переместить %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Имя файла не может быть пустым."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Имя файла не должно содержать символ \"/\". Пожалуйста, выберите другое имя."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" это не правильное имя файла."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Неправильное имя: символы '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "Целевой каталог был перемещен или удален."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
-msgstr "Имя %s уже используется в папке %s. Пожалуйста выберите другое имя."
+msgstr "Имя %s уже используется для каталога %s. Пожалуйста, выберите другое имя."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Неправильный источник"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Сервер не позволяет открывать URL-адреса, пожалуйста, проверьте настройки сервера"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
-msgstr "Ошибка при загрузке %s в %s"
+msgstr "Ошибка при скачивании %s в %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Ошибка при создании файла"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Имя папки не может быть пустым."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Имя папки не должно содержать символ \"/\". Пожалуйста, выберите другое имя."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
-msgstr "Ошибка при создании папки"
+msgstr "Ошибка создания каталога"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Не удалось установить каталог загрузки."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Недопустимый маркер"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Файл не был загружен. Неизвестная ошибка"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл загружен успешно."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "Файл превышает размер установленный upload_max_filesize в php.ini:"
+msgstr "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "Загружаемый файл превосходит значение переменной MAX_FILE_SIZE, указанной в форме HTML"
+msgstr "Загруженный файл превышает размер, установленный параметром MAX_FILE_SIZE в HTML-форме"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
-msgstr "Файл загружен частично"
+msgstr "Файл загружен лишь частично"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
-msgstr "Файл не был загружен"
+msgstr "Ни одного файла загружено не было"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
-msgstr "Отсутствует временная папка"
+msgstr "Отсутствует временный каталог"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Ошибка записи на диск"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Недостаточно доступного места в хранилище"
 
-#: ajax/upload.php:127 ajax/upload.php:154
+#: ajax/upload.php:160
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Загрузка не удалась. Невозможно найти загружаемый файл"
+
+#: ajax/upload.php:170
 msgid "Upload failed. Could not get file info."
 msgstr "Загрузка не удалась. Невозможно получить информацию о файле"
 
-#: ajax/upload.php:144
-msgid "Upload failed. Could not find uploaded file"
-msgstr "Загрузка не удалась. Невозможно найти загруженный файл"
-
-#: ajax/upload.php:172
+#: ajax/upload.php:189
 msgid "Invalid directory."
-msgstr "Неправильный каталог."
+msgstr "Неверный каталог."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Файлы"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr "Невозможно загрузить файл  {filename} так как он является директорией либо имеет размер 0 байт"
+msgstr "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Недостаточно свободного места"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Полный размер файла {size1} превышает лимит по загрузке {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Не достаточно свободного места, Вы загружаете {size1} но осталось только {size2}"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
-msgstr "Не получен ответ от сервера"
+msgstr "Не удалось получить ответ от сервера."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
+msgstr "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "Ссылка не может быть пустой."
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
-msgstr "В домашней папке 'Shared' зарезервированное имя файла"
+msgstr "'Shared' - это зарезервированное имя файла в домашнем каталоге"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} уже существует"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Не удалось создать файл"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
-msgstr "Не удалось создать папку"
+msgstr "Не удалось создать каталог"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Ошибка получения URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Открыть доступ"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
-msgstr "Удалено навсегда"
+msgstr "Удалить окончательно"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Не удалось переименовать файл"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменено {new_name} на {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Ошибка при удалении файла."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
-msgstr[0] "%n папка"
-msgstr[1] "%n папки"
-msgstr[2] "%n папок"
+msgstr[0] "%n каталог"
+msgstr[1] "%n каталога"
+msgstr[2] "%n каталогов"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n файл"
 msgstr[1] "%n файла"
 msgstr[2] "%n файлов"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} и {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Закачка %n файла"
 msgstr[1] "Закачка %n файлов"
 msgstr[2] "Закачка %n файлов"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' - неправильное имя файла."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" это не правильное имя файла."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr "Ваше дисковое пространство полностью заполнено, произведите очистку перед загрузкой новых файлов."
+msgstr "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов."
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше хранилище почти заполнено ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Приложение для шифрования активно, но ваши ключи не инициализированы, пожалуйста, перелогиньтесь"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr "Неверный приватный ключ для приложения шифрования. Пожалуйста, обноваите ваш приватный ключ в персональных настройках чтобы восстановить доступ к вашим зашифрованным файлам."
+msgstr "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr "Шифрование было отключено, но ваши файлы все еще зашифрованы. Пожалуйста, зайдите на страницу персональных настроек для того, чтобы расшифровать ваши файлы."
+msgstr "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
-msgstr "Загрузка началась. Это может потребовать много времени, если файл большого размера."
+msgstr "Идёт подготовка к скачиванию. Это может занять некоторое время, если файлы большого размера."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Ошибка при перемещении файла"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Имя"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
-msgstr "Изменён"
+msgstr "Дата изменения"
 
 #: lib/app.php:60
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Неправильное имя каталога. Имя 'Shared' зарезервировано."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s не может быть переименован"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Загрузка"
 
@@ -341,7 +350,7 @@ msgstr "Требуется для скачивания нескольких фа
 
 #: templates/admin.php:17
 msgid "Enable ZIP-download"
-msgstr "Включить ZIP-скачивание"
+msgstr "Включить скачивание в виде архивов ZIP"
 
 #: templates/admin.php:20
 msgid "0 is unlimited"
@@ -355,72 +364,68 @@ msgstr "Максимальный исходный размер для ZIP фай
 msgid "Save"
 msgstr "Сохранить"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Новый"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Новый текстовый файл"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Текстовый файл"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
-msgstr "Новая папка"
+msgstr "Новый каталог"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
-msgstr "Папка"
+msgstr "Каталог"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
-msgstr "Из ссылки"
+msgstr "Объект по ссылке"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Удалённые файлы"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
-msgstr "Отмена загрузки"
+msgstr "Отменить загрузку"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
-msgstr "У вас недостаточно прав для загрузки или создания файлов отсюда."
+msgstr "У вас нет прав для загрузки или создания файлов здесь."
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Файл слишком велик"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Файлы, которые вы пытаетесь загрузить, превышают лимит для файлов на этом сервере."
+msgstr "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Подождите, файлы сканируются."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Текущее сканирование"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Обновление кэша файловой системы..."
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index 821add2380..d0f028c8df 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -8,15 +8,16 @@
 # lord93 <lordakryl@gmail.com>, 2013
 # jekader <jekader@gmail.com>, 2013
 # eurekafag <rkfg@rkfg.me>, 2013
+# Swab <swab@i.ua>, 2014
 # Victor Bravo <>, 2013
 # vsapronov <vladimir.sapronov@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-11-30 04:00+0000\n"
-"Last-Translator: vsapronov <vladimir.sapronov@gmail.com>\n"
+"POT-Creation-Date: 2014-03-28 01:55-0400\n"
+"PO-Revision-Date: 2014-03-27 14:31+0000\n"
+"Last-Translator: Swab <swab@i.ua>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,18 +88,18 @@ msgid ""
 "administrator"
 msgstr "Неизвестная ошибка, пожалуйста, проверьте системные настройки или свяжитесь с администратором"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Требования отсутствуют."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Для следующих пользователей шифрование не настроено:"
 
@@ -106,9 +107,9 @@ msgstr "Для следующих пользователей шифровани
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Начато начальное шифрование... Это может занять какое-то время. Пожалуйста, подождите."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Сохранение..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Работает первоначальное шифрование... Пожалуйста, повторите попытку позже."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 24a62cae43..74a21556d8 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Swab <swab@i.ua>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-18 11:40+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-28 01:55-0400\n"
+"PO-Revision-Date: 2014-03-27 14:41+0000\n"
+"Last-Translator: Swab <swab@i.ua>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +18,44 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Доступ предоставлен"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Ошибка при настройке хранилища Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Предоставление доступа"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Пожалуйста, предоставьте действующий ключ Dropbox и пароль."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Ошибка при настройке хранилища Google Drive"
 
-#: lib/config.php:467
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Сохранено"
+
+#: lib/config.php:654
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Внимание:</b> \"smbclient\" не установлен. Подключение по CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
 
-#: lib/config.php:471
+#: lib/config.php:658
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Внимание:</b> Поддержка FTP не включена в PHP. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы включить."
 
-#: lib/config.php:474
+#: lib/config.php:661
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +107,22 @@ msgid "Users"
 msgstr "Пользователи"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Включить пользовательские внешние носители"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Разрешить пользователям монтировать их собственные внешние носители"
+msgid "Allow users to mount the following external storage"
+msgstr "Разрешить пользователям монтировать следующую внешнюю систему хранения данных"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Корневые сертификаты SSL"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Импортировать корневые сертификаты"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 2b5eca9c97..6797636fb1 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# mogarych <mogarych@mail.ru>, 2014
 # Victor Bravo <>, 2013
 # not_your_conscience <hex.void@gmail.com>, 2013
 # Den4md <denstarr@mail.md>, 2013
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: not_your_conscience <hex.void@gmail.com>\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,9 +21,13 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Доступ открыл {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
-msgstr "Эта шара защищена паролем"
+msgstr "Общий ресурс защищён паролем"
 
 #: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
@@ -50,38 +55,22 @@ msgstr "срок ссылки истёк"
 
 #: templates/part.404.php:8
 msgid "sharing is disabled"
-msgstr "обмен отключен"
+msgstr "общий доступ отключён"
 
 #: templates/part.404.php:10
 msgid "For more info, please ask the person who sent this link."
-msgstr "Для получения дополнительной информации, пожалуйста, спросите того кто отослал данную ссылку."
+msgstr "Пожалуйста, обратитесь к отправителю данной ссылки."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s открыл доступ к папке %s для Вас"
+msgid "shared by %s"
+msgstr "Поделиться с %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s открыл доступ к файлу %s для Вас"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Скачать"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Загрузка"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Отмена загрузки"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Предпросмотр недоступен для"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Прямая ссылка"
diff --git a/l10n/ru/files_trashbin.po b/l10n/ru/files_trashbin.po
index 4e30a52f76..01e8606600 100644
--- a/l10n/ru/files_trashbin.po
+++ b/l10n/ru/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-18 11:40+0000\n"
-"Last-Translator: baden <badaevd@mail.ru>\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,21 +19,25 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s не может быть удалён навсегда"
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "%s не может быть восстановлен"
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Удалённые файлы"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Ошибка"
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "восстановлен"
 
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index cb1007c9a5..f2f68e4ca1 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,38 +24,38 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Приложение \"%s\" нельзя установить, так как оно не совместимо с текущей версией ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Не выбрано имя приложения"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Помощь"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Личное"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Конфигурация"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Пользователи"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Не смог обновить \"%s\"."
@@ -68,15 +68,10 @@ msgstr "Неизвестный тип файла"
 msgid "Invalid image"
 msgstr "Изображение повреждено"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "веб-сервисы под вашим управлением"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "не могу открыть \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP-скачивание отключено."
@@ -99,74 +94,78 @@ msgid ""
 "administrator."
 msgstr "Загрузите файлы раздельно маленькими частями или вежливо попросите вашего администратора."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Не указан источник при установке приложения"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Не указан атрибут href при установке приложения через http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Не указан путь при установке приложения из локального файла"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Архивы %s не поддерживаются"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Не возможно открыть архив при установке приложения"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Приложение не имеет файла info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Приложение невозможно установить. В нем содержится запрещенный код."
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Приложение невозможно установить. Не совместимо с текущей версией ownCloud."
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Приложение невозможно установить. Оно содержит параметр <shipped>true</shipped> который не допустим для приложений, не входящих в поставку."
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Приложение невозможно установить. Версия в info.xml/version не совпадает с версией заявленной в магазине приложений"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Папка приложения уже существует"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Не удалось создать директорию. Исправьте права доступа. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Приложение не разрешено"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Ошибка аутентификации"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Токен просрочен. Перезагрузите страницу."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Файлы"
@@ -206,8 +205,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Вы должны войти или в существующий аккаунт или под администратором."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Неверное имя пользователя и/или пароль MySQL"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -234,21 +233,21 @@ msgstr "Вызываемая команда была: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Пользователь MySQL '%s'@'localhost' уже существует."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Удалить этого пользователя из MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Пользователь MySQL '%s'@'%%' уже существует"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Удалить этого пользователя из MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -275,70 +274,76 @@ msgstr "Установить имя пользователя для admin."
 msgid "Set an admin password."
 msgstr "становит пароль для admin."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s поделился »%s« с вами"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Категория \"%s\"  не найдена"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "несколько секунд назад"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n минута назад"
 msgstr[1] "%n минуты назад"
 msgstr[2] "%n минут назад"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n час назад"
 msgstr[1] "%n часа назад"
 msgstr[2] "%n часов назад"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "сегодня"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "вчера"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n день назад"
 msgstr[1] "%n дня назад"
 msgstr[2] "%n дней назад"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n месяц назад"
 msgstr[1] "%n месяца назад"
 msgstr[2] "%n месяцев назад"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "в прошлом году"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "несколько лет назад"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 91d66080a2..5654edd1a8 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -22,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-06 01:55-0500\n"
-"PO-Revision-Date: 2014-01-05 23:30+0000\n"
-"Last-Translator: stushev\n"
+"POT-Creation-Date: 2014-03-28 01:55-0400\n"
+"PO-Revision-Date: 2014-03-27 14:41+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,6 +32,48 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Сохранено"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Письмо отправлено"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Шифрование"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Не удалось загрузить список из App Store"
@@ -128,62 +170,90 @@ msgstr "Используемый механизм не поддерживает
 msgid "Unable to change password"
 msgstr "Невозможно изменить пароль"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Пользовательская документация"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Обновить до {версия приложения}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Выключить"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Включить"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Подождите..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Ошибка отключения приложения"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Ошибка включения приложения"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Обновление..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Ошибка при обновлении приложения"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Обновить"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Обновлено"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Выберите картинку профиля"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Очень слабый пароль"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Слабый пароль"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Так себе пароль"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Хороший пароль"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Устойчивый к взлому пароль"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Сохранение..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "удален"
@@ -196,40 +266,40 @@ msgstr "отмена"
 msgid "Unable to remove user"
 msgstr "Невозможно удалить пользователя"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Группы"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Администратор группы"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "добавить группу"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Укажите правильное имя пользователя"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Ошибка создания пользователя"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Укажите валидный пароль"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Предупреждение: домашняя папка пользователя \"{user}\" уже существует"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Русский "
 
@@ -253,18 +323,42 @@ msgstr "Ошибки и критические проблемы"
 msgid "Fatal issues only"
 msgstr "Только критические проблемы"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Нет новостей"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Логин"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Предупреждение безопасности"
 
-#: templates/admin.php:25
+#: 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:39
+#: 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 "
@@ -273,68 +367,68 @@ msgid ""
 "root."
 msgstr "Похоже, что папка с Вашими данными и Ваши файлы доступны из интернета. Файл .htaccess не работает. Мы настойчиво предлагаем Вам сконфигурировать вебсервер таким образом, чтобы папка с Вашими данными более не была доступна или переместите папку с данными куда-нибудь в другое место вне основной папки документов вебсервера."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Предупреждение установки"
 
-#: templates/admin.php:53
+#: 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:54
+#: 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:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Модуль 'fileinfo' отсутствует"
 
-#: templates/admin.php:68
+#: 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 "PHP-модуль 'fileinfo' отсутствует. Мы настоятельно рекомендуем включить этот модуль для улучшения определения типов (mime-type) файлов."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Ваша версия PHP устарела"
 
-#: templates/admin.php:82
+#: 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:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Локализация не работает"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Невозможно установить системную локаль, поддерживающую UTF-8"
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Это значит, что могут быть проблемы с некоторыми символами в именах файлов."
 
-#: templates/admin.php:106
+#: 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:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Интернет-соединение не работает"
 
-#: templates/admin.php:121
+#: 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 "
@@ -343,118 +437,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Этот сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение внешних дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если Вы хотите иметь все возможности."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Планировщик задач по расписанию"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Выполнять одно задание с каждой загруженной страницей"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php зарегестрирован в webcron и будет вызываться каждые 15 минут по http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Использовать системный cron для вызова cron.php каждые 15 минут."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Общий доступ"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Включить API общего доступа"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Позволить приложениям использовать API общего доступа"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Разрешить ссылки"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Разрешить пользователям открывать в общий доступ элементы с публичной ссылкой"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Разрешить открытые загрузки"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Разрешить пользователям позволять другим загружать в их открытые папки"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Разрешить переоткрытие общего доступа"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Позволить пользователям открывать общий доступ к эллементам уже открытым в общий доступ"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Разрешить пользователя делать общий доступ любому"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Разрешить пользователям делать общий доступ только для пользователей их групп"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Разрешить уведомление по почте"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Разрешить пользователю оповещать почтой о расшаренных файлах"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Безопасность"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Принудить к HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Принудить клиентов подключаться к %s через шифрованное соединение."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить принудительное SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Адрес сервера"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Порт"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Полномочия"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Уровень детализации журнала"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Больше"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Меньше"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Версия"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -464,30 +618,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Добавить приложение"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Больше приложений"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Выберите приложение"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Смотрите дополнения на apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Пользовательская документация"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Документация администратора"
@@ -521,7 +679,7 @@ msgstr "Показать помощник настройки"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Пароль"
 
@@ -533,151 +691,149 @@ msgstr "Ваш пароль изменён"
 msgid "Unable to change your password"
 msgstr "Невозможно сменить пароль"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Новый пароль"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Сменить пароль"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Полное имя"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Ваш адрес электронной почты"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Введите адрес электронной почты, чтобы появилась возможность восстановления пароля"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Фото профиля"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Загрузить новую"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Выберите новый из файлов"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Удалить изображение"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Будет использован аватар вашей оригинальной учетной записи."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Отмена"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Отменить"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Выберите изображение профиля"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Язык"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Помочь с переводом"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Используйте этот адресс для <a href=\"%s\" target=\"_blank\">доступа к вашим файлам через WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Шифрование"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Пароль входа"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Снять шифрование со всех файлов"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Имя пользователя"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Создать"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Восстановление пароля администратора"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Хранилище по умолчанию"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Неограниченно"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Другое"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Имя пользователя"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Хранилище"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "изменить полное имя"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "установить новый пароль"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "По умолчанию"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 686aeb1269..449f689dc9 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -8,6 +8,7 @@
 # alfsoft <alfsoft@gmail.com>, 2013
 # jekader <jekader@gmail.com>, 2013
 # Евгений Белоусов <kvantor12@gmail.com>, 2013
+# mogarych <mogarych@mail.ru>, 2014
 # unixoid <victor.ashirov@gmail.com>, 2013
 # vsapronov <vladimir.sapronov@gmail.com>, 2013
 # not_your_conscience <hex.void@gmail.com>, 2013
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -95,43 +96,43 @@ msgstr "Успешно"
 msgid "Error"
 msgstr "Ошибка"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Конфигурация в порядке"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Конфигурация неправильна"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Конфигурация не завершена"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Выберите группы"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Выберите объектные классы"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Выберите атрибуты"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Проверка соединения удалась"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Проверка соединения не удалась"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Вы действительно хотите удалить существующую конфигурацию сервера?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Подтверждение удаления"
 
@@ -151,11 +152,11 @@ msgstr[0] "%s пользователь найден"
 msgstr[1] "%s пользователя найдено"
 msgstr[2] "%s пользователей найдено"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Неверный сервер"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Не могу найти требуемой функциональности"
 
@@ -173,8 +174,8 @@ msgstr "Помощь"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Ограничить доступ к %s группам, удовлетворяющим этому критерию:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -209,8 +210,8 @@ msgid "groups found"
 msgstr "групп найдено"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Какой атрибут должен быть использован для логина:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -277,8 +278,8 @@ msgstr "Вы можете задать Base DN для пользователей
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -420,41 +421,51 @@ msgstr "Атрибуты поиска для группы"
 msgid "Group-Member association"
 msgstr "Ассоциация Группа-Участник"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Специальные атрибуты"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Поле квоты"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Квота по умолчанию"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Поле адреса электронной почты"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Правило именования домашней папки пользователя"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Внутреннее имя пользователя"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -470,15 +481,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для папки пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Атрибут для внутреннего имени:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Переопределить нахождение UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -487,21 +498,21 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно индентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP."
+msgstr "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID-атрибуты для пользователей:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID-атрибуты для групп:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Соответствия Имя-Пользователь LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -515,10 +526,10 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует привязки имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кешируется различающееся имя (DN) для уменьшения числа обращений к LDAP, однако оно не используется для идентификации. Если различающееся имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. После сброса привязок в базе могут сохраниться остатки старой информации. Сброс привязок не привязан к конфигурации, он повлияет на все LDAP-подключения! Ни в коем случае не рекомендуется сбрасывать привязки, если система уже находится в эксплуатации, только на этапе тестирования."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Очистить соответствия Имя-Пользователь LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Очистить соответствия Группа-Группа LDAP"
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index ff4597f8a1..d52d4ae389 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "ඉරිදා"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "සඳුදා"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "අඟහරුවාදා"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "බදාදා"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "බ්‍රහස්පතින්දා"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "සිකුරාදා"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "සෙනසුරාදා"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "ජනවාරි"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "පෙබරවාරි"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "මාර්තු"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "අප්‍රේල්"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "මැයි"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "ජූනි"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "ජූලි"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "අගෝස්තු"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "සැප්තැම්බර්"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "ඔක්තෝබර"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "නොවැම්බර්"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "දෙසැම්බර්"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "සුරැකෙමින් පවතී..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "අද"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "මාස කීපයකට පෙර"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr "බෙදා හදා ගන්න"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "මුර පදයකින් ආරක්ශාකරන්න"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "මුර පදය"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "කල් ඉකුත් විමේ දිනය"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: "
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "කණ්ඩායම"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "නොබෙදු"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "සංස්කරණය කළ හැක"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "ප්‍රවේශ පාලනය"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "සදන්න"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "යාවත්කාලීන කරන්න"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "මකන්න"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "බෙදාහදාගන්න"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "අවවාදය"
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "පරිශීලක නම"
 
@@ -517,6 +533,18 @@ msgstr "නව මුරපදය"
 msgid "Reset password"
 msgstr "මුරපදය ප්‍රත්‍යාරම්භ කරන්න"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "පෞද්ගලික"
@@ -525,7 +553,7 @@ msgstr "පෞද්ගලික"
 msgid "Users"
 msgstr "පරිශීලකයන්"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "යෙදුම්"
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "දියුණු/උසස්"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "දත්ත ෆෝල්ඩරය"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "දත්ත සමුදාය හැඩගැසීම"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "භාවිතා වනු ඇත"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "දත්තගබඩා භාවිතාකරු"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "දත්තගබඩාවේ මුරපදය"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "දත්තගබඩාවේ නම"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "දත්තගබඩා සේවාදායකයා"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "නික්මීම"
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "මුරපදය අමතකද?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "මතක තබාගන්න"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "ප්‍රවේශවන්න"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 9df11d7710..4d19ae87f3 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "දෝෂයක් නොමැත. සාර්ථකව ගොනුව උඩුගත කෙරුණි"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "ගොනුවක් උඩුගත නොවුණි"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "තැටිගත කිරීම අසාර්ථකයි"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "ගොනු"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත"
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "බෙදා හදා ගන්න"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "නිෂ්ප්‍රභ කරන්න"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "වෙනස් කළ"
 
@@ -301,12 +308,12 @@ msgstr "වෙනස් කළ"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "උඩුගත කරන්න"
 
@@ -342,72 +349,68 @@ msgstr "ZIP ගොනු සඳහා දැමිය හැකි උපරි
 msgid "Save"
 msgstr "සුරකින්න"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "නව"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "පෙළ ගොනුව"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "ෆෝල්ඩරය"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "යොමුවෙන්"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "උඩුගත කිරීම අත් හරින්න"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "බාන්න"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "උඩුගත කිරීම විශාල වැඩිය"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "වර්තමාන පරික්ෂාව"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 7edd1f497a..bd5b1eb2e3 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "සුරැකෙමින් පවතී..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index cfd9ed24ec..9e8b521ac5 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "පිවිසීමට හැක"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "පිවිසුම ලබාදෙන්න"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "පරිශීලකයන්"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "පරිශීලක භාහිර ගබඩාවන් සක්‍රිය කරන්න"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "පරිශීලකයන්ට තමාගේම භාහිර ගබඩාවන් මවුන්ට් කිරීමේ අයිතිය දෙන්න"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL මූල සහතිකයන්"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "මූල සහතිකය ආයාත කරන්න"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index fd643b4125..58f715f18b 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "බාන්න"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "උඩුගත කරන්න"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "උඩුගත කිරීම අත් හරින්න"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "පූර්වදර්ශනයක් නොමැත"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/si_LK/files_trashbin.po b/l10n/si_LK/files_trashbin.po
index 93598dcd45..d34ed9fd0b 100644
--- a/l10n/si_LK/files_trashbin.po
+++ b/l10n/si_LK/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "නම"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index 584bebcb4d..8699aa3e99 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "උදව්"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "පෞද්ගලික"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "සිටුවම්"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "පරිශීලකයන්"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "පරිපාලක"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP භාගත කිරීම් අක්‍රියයි"
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "යෙදුම සක්‍රිය කර නොමැත"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "සත්‍යාපන දෝෂයක්"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න"
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "ගොනු"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "අද"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index f2d8b41cc8..6fd3478676 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "ගුප්ත කේතනය"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "අක්‍රිය කරන්න"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "සක්‍රිය කරන්න"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "යාවත්කාල කිරීම"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "සුරැකෙමින් පවතී..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "නිෂ්ප්‍රභ කරන්න"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "කණ්ඩායම්"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "කාණ්ඩ පරිපාලක"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "කිසිවක් නැත"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "ප්‍රවිශ්ටය"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "ආරක්ෂක නිවේදනයක්"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "හුවමාරු කිරීම"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "යොමු සලසන්න"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "යළි යළිත් හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "හුවමාරු කළ  හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "ඕනෑම අයෙකු හා හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "සේවාදායකයේ ලිපිනය"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "තොට"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "ලඝුව"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "වැඩි"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "අඩු"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "යෙදුමක් එක් කිරීම"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "තවත් යෙදුම්"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "යෙදුමක් තොරන්න"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "මුර පදය"
 
@@ -518,151 +676,149 @@ msgstr "ඔබගේ මුර පදය වෙනස් කෙරුණි"
 msgid "Unable to change your password"
 msgstr "මුර පදය වෙනස් කළ නොහැකි විය"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "වත්මන් මුරපදය"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "නව මුරපදය"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "මුරපදය වෙනස් කිරීම"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "විද්‍යුත් තැපෑල"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "ඔබගේ විද්‍යුත් තැපෑල"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "එපා"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "භාෂාව"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "පරිවර්ථන සහය"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "ගුප්ත කේතනය"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "ප්‍රවිශ්ටය"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "තනන්න"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "වෙනත්"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "පරිශීලක නම"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index f7bb2e04b6..e6f39fc39d 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "සාර්ථකයි"
 msgid "Error"
 msgstr "දෝෂයක්"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "උදව්"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/sk/core.po b/l10n/sk/core.po
index 1d149c8a11..72d438e715 100644
--- a/l10n/sk/core.po
+++ b/l10n/sk/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-05 01:55-0500\n"
-"PO-Revision-Date: 2014-01-04 15:30+0000\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,139 +58,143 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Pondelok"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Streda"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Piatok"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Január"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Február"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Marec"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Apríl"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Máj"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Jún"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Júl"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Október"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "December"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -273,6 +263,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -281,12 +291,12 @@ msgstr ""
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -298,123 +308,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -461,11 +471,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -485,8 +501,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -522,6 +538,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Osobné"
@@ -530,7 +558,7 @@ msgstr "Osobné"
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -640,49 +668,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Pokročilé"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -698,7 +724,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -724,27 +750,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/sk/files.po b/l10n/sk/files.po
index dee18527fb..d705cf64c2 100644
--- a/l10n/sk/files.po
+++ b/l10n/sk/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-05 01:55-0500\n"
-"PO-Revision-Date: 2014-01-04 15:30+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,286 +17,293 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -304,12 +311,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -345,72 +352,68 @@ msgstr ""
 msgid "Save"
 msgstr "Uložiť"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/sk/files_encryption.po b/l10n/sk/files_encryption.po
index 56f3e5e10c..876401e6a7 100644
--- a/l10n/sk/files_encryption.po
+++ b/l10n/sk/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/sk/files_external.po b/l10n/sk/files_external.po
index 5a80877b71..536ee6f6b9 100644
--- a/l10n/sk/files_external.po
+++ b/l10n/sk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-05 01:55-0500\n"
-"PO-Revision-Date: 2014-01-04 15:20+0000\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:467
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:471
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:474
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sk/files_sharing.po b/l10n/sk/files_sharing.po
index 2783214c34..1c1b6602df 100644
--- a/l10n/sk/files_sharing.po
+++ b/l10n/sk/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-05 01:55-0500\n"
-"PO-Revision-Date: 2014-01-04 15:30+0000\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Stiahnuť"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/sk/files_trashbin.po b/l10n/sk/files_trashbin.po
index 7cd4fe3874..11f7b773ea 100644
--- a/l10n/sk/files_trashbin.po
+++ b/l10n/sk/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-05 01:55-0500\n"
-"PO-Revision-Date: 2014-01-04 15:20+0000\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,21 +17,25 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/sk/lib.po b/l10n/sk/lib.po
index 9cd71b7433..0e98417ded 100644
--- a/l10n/sk/lib.po
+++ b/l10n/sk/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-05 01:55-0500\n"
-"PO-Revision-Date: 2014-01-04 15:20+0000\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"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,34 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: private/app.php:245
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:257
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:362
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:375
+#: private/app.php:366
 msgid "Personal"
 msgstr "Osobné"
 
-#: private/app.php:386
+#: private/app.php:377
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: private/app.php:398
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:411
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,70 +267,76 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/sk/settings.po b/l10n/sk/settings.po
index 6a0e0098d4..c4904394fe 100644
--- a/l10n/sk/settings.po
+++ b/l10n/sk/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-05 01:55-0500\n"
-"PO-Revision-Date: 2014-01-04 15:20+0000\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Zrušiť"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Ostatné"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/sk/user_ldap.po b/l10n/sk/user_ldap.po
index 79c47dfcc6..6caf66c53b 100644
--- a/l10n/sk/user_ldap.po
+++ b/l10n/sk/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-05 01:55-0500\n"
-"PO-Revision-Date: 2014-01-04 15:20+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/owncloud/language/sk/)\n"
 "MIME-Version: 1.0\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -200,7 +200,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -268,7 +268,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -411,41 +411,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 18d65c58b7..4a51239c72 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013
+# mhh <marian.hvolka@stuba.sk>, 2013-2014
 # martin, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +19,11 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s s vami zdieľa »%s«"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Nebolo možné odoslať email týmto používateľom: %s "
@@ -41,19 +40,6 @@ msgstr "Mód údržby e vypnutý"
 msgid "Updated database"
 msgstr "Databáza je aktualizovaná"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Aktualizácia \"filecache\", toto môže trvať dlhšie..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "\"Filecache\" aktualizovaná"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% dokončených ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Obrázok alebo súbor nebol zadaný"
@@ -74,139 +60,143 @@ msgstr "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu"
 msgid "No crop data provided"
 msgstr "Dáta pre orezanie neboli zadané"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Pondelok"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Streda"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Piatok"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Sobota"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Január"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Február"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Marec"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Apríl"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Máj"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Jún"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Júl"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "August"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Október"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "December"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Ukladám..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "pred %n minútou"
 msgstr[1] "pred %n minútami"
 msgstr[2] "pred %n minútami"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "pred %n hodinou"
 msgstr[1] "pred %n hodinami"
 msgstr[2] "pred %n hodinami"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "pred %n dňom"
 msgstr[1] "pred %n dňami"
 msgstr[2] "pred %n dňami"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "pred %n mesiacom"
 msgstr[1] "pred %n mesiacmi"
 msgstr[2] "pred %n mesiacmi"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "pred rokmi"
 
@@ -275,6 +265,26 @@ msgstr "({count} vybraných)"
 msgid "Error loading file exists template"
 msgstr "Chyba pri nahrávaní šablóny existencie súboru"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Zdieľané"
@@ -283,12 +293,12 @@ msgstr "Zdieľané"
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Chyba"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Chyba počas zdieľania"
 
@@ -300,123 +310,123 @@ msgstr "Chyba počas ukončenia zdieľania"
 msgid "Error while changing permissions"
 msgstr "Chyba počas zmeny oprávnení"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Zdieľané s vami a so skupinou {group} používateľom {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Zdieľané s vami používateľom {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Zdieľať s používateľom alebo skupinou ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Zdieľať linku"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Chrániť heslom"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Heslo"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Povoliť verejné nahrávanie"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Odoslať odkaz emailom"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Odoslať"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Nastaviť dátum expirácie"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Dátum expirácie"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Zdieľať cez email:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Používateľ nenájdený"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Zdieľanie už zdieľanej položky nie je povolené"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Zdieľané v {item} s {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Zrušiť zdieľanie"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "informovať emailom"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "môže upraviť"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "prístupové práva"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "vytvoriť"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "aktualizovať"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "vymazať"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "zdieľať"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Chránené heslom"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraňovaní dátumu expirácie"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavení dátumu expirácie"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Odosielam ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email odoslaný"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Varovanie"
 
@@ -457,17 +467,23 @@ msgid ""
 "The update was unsuccessful. Please report this issue to the <a "
 "href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
 "community</a>."
-msgstr "Aktualizácia nebola úspešná. Problém nahláste na <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>."
+msgstr "Aktualizácia nebola úspešná. Problém nahláste <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud comunite</a>."
 
 #: js/update.js:21
 msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr "Aktualizácia bola úspešná. Presmerovávam na prihlasovaciu stránku."
+msgstr "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "reset hesla %s"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}"
@@ -477,7 +493,7 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr "Odkaz na obnovenie hesla bol odoslaný na Vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si Váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora."
+msgstr "Odkaz na obnovenie hesla bol odoslaný na vašu emailovú adresu.<br>Ak ho v krátkej dobe neobdržíte, skontrolujte si váš kôš a priečinok spam.<br>Ak ho ani tam nenájdete, kontaktujte svojho administrátora."
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request failed!<br>Did you make sure your email/username was right?"
@@ -485,10 +501,10 @@ msgstr "Požiadavka zlyhala.<br>Uistili ste sa, že vaše používateľské meno
 
 #: lostpassword/templates/lostpassword.php:18
 msgid "You will receive a link to reset your password via Email."
-msgstr "Odkaz pre obnovenie hesla obdržíte e-mailom."
+msgstr "Odkaz pre obnovenie hesla obdržíte emailom."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Meno používateľa"
 
@@ -524,6 +540,18 @@ msgstr "Nové heslo"
 msgid "Reset password"
 msgstr "Obnovenie hesla"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Osobné"
@@ -532,7 +560,7 @@ msgstr "Osobné"
 msgid "Users"
 msgstr "Používatelia"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Aplikácie"
 
@@ -588,7 +616,7 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr "Ahoj,\n\nchcem ti dať navedomie, že %s zdieľa %s s tebou.\nZobrazenie tu: %s\n\n"
+msgstr "Ahoj,\n\nchcem ti dať navedomie, že %s s tebou zdieľa %s.\nTu je odkaz: %s\n\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
@@ -597,7 +625,7 @@ msgstr "Zdieľanie expiruje %s."
 
 #: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
-msgstr "Za zdravie!"
+msgstr "Pekný deň!"
 
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
@@ -642,49 +670,47 @@ msgstr "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a h
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvoriť <strong>administrátorský účet</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Rozšírené"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Priečinok dát"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Nastaviť databázu"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "bude použité"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Používateľ databázy"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Heslo databázy"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Meno databázy"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tabuľkový priestor databázy"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Server databázy"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Dokončiť inštaláciu"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Dokončujem..."
 
@@ -698,9 +724,9 @@ msgstr "Táto aplikácia vyžaduje JavaScript a tento musí byť povolený pre s
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
-msgstr "%s je dostupná. Získajte viac informácií k postupu aktualizácie."
+msgstr "%s je dostupná. Získajte viac informácií o postupe aktualizácie."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Odhlásiť"
 
@@ -712,11 +738,11 @@ msgstr "Automatické prihlásenie bolo zamietnuté!"
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr "V nedávnej dobe ste nezmenili svoje heslo, váš účet môže byť kompromitovaný."
+msgstr "V nedávnej dobe ste si nezmenili svoje heslo, váš účet môže byť kompromitovaný."
 
 #: templates/login.php:12
 msgid "Please change your password to secure your account again."
-msgstr "Prosím, zmeňte svoje heslo pre opätovné zabezpečenie vášho účtu"
+msgstr "Prosím, zmeňte si svoje heslo pre opätovné zabezpečenie vášho účtu."
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
@@ -726,28 +752,28 @@ msgstr "Autentifikácia na serveri zlyhala!"
 msgid "Please contact your administrator."
 msgstr "Kontaktujte prosím vášho administrátora."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Zabudli ste heslo?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "zapamätať"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Prihlásiť sa"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternatívne prihlásenie"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Ahoj,<br><br>chcem ti dať navedomie, že %s zdieľa »%s« s tebou.<br><a href=\"%s\">Zobrazenie tu!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 3ac04ae10b..8694064b15 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013
+# mhh <marian.hvolka@stuba.sk>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,286 +18,293 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Nie je možné presunúť %s - súbor s týmto menom už existuje"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Nie je možné presunúť %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Meno súboru nemôže byť prázdne"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Názov súboru nesmie obsahovať \"/\". Prosím zvoľte iný názov."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Názov %s už používa priečinok s%. Prosím zvoľte iný názov."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Neplatný zdroj"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
+msgstr "Server nie je oprávnený otvárať adresy URL. Overte nastavenia servera."
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Chyba pri sťahovaní súboru %s do %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Chyba pri vytváraní súboru"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Názov priečinka nemôže byť prázdny."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Názov priečinka nesmie obsahovať \"/\". Prosím zvoľte iný názov."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Chyba pri vytváraní priečinka"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Nemožno nastaviť priečinok pre nahrané súbory."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Neplatný token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Žiaden súbor nebol nahraný. Neznáma chyba"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Nenastala žiadna chyba, súbor bol úspešne nahraný"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Nahraný súbor prekročil limit nastavený v upload_max_filesize v súbore php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ukladaný súbor sa nahral len čiastočne"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Žiadny súbor nebol uložený"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Chýba dočasný priečinok"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Zápis na disk sa nepodaril"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Nedostatok dostupného úložného priestoru"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Nahrávanie zlyhalo. Nepodarilo sa nájsť nahrávaný súbor"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Neplatný priečinok."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Súbory"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Nie je k dispozícii dostatok miesta"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Odosielanie zrušené."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Nepodarilo sa dostať výsledky zo servera."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Opustenie stránky zruší práve prebiehajúce odosielanie súboru."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL nemôže byť prázdna"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "V domovskom priečinku je názov \"Shared\" vyhradený názov súboru"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} už existuje"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Nemožno vytvoriť súbor"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Nemožno vytvoriť priečinok"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
-msgstr ""
+msgstr "Chyba pri načítavaní URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Zdieľať"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Zmazať  trvalo"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Premenovať"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Prebieha"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Nemožno premenovať súbor"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "prepísaný {new_name} súborom {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "vrátiť"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Chyba pri mazaní súboru."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n priečinok"
 msgstr[1] "%n priečinky"
 msgstr[2] "%n priečinkov"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n súbor"
 msgstr[1] "%n súbory"
 msgstr[2] "%n súborov"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} a {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Nahrávam %n súbor"
 msgstr[1] "Nahrávam %n súbory"
 msgstr[2] "Nahrávam %n súborov"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' je neplatné meno súboru."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Vaše úložisko je takmer plné ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Aplikácia na šifrovanie je zapnutá, ale vaše kľúče nie sú inicializované. Odhláste sa a znovu sa prihláste."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Chybný súkromný kľúč na šifrovanie aplikácií. Zaktualizujte si heslo súkromného kľúča v svojom osobnom nastavení, aby ste znovu získali prístup k svojim zašifrovaným súborom."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Vaše sťahovanie sa pripravuje. Ak sú sťahované súbory veľké, môže to chvíľu trvať."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Chyba pri presúvaní súboru"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Chyba"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Názov"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Upravené"
 
@@ -305,12 +312,12 @@ msgstr "Upravené"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Názov priečinka je chybný. Použitie názvu 'Shared' nie je povolené."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s nemohol byť premenovaný"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Odoslať"
 
@@ -346,72 +353,68 @@ msgstr "Najväčšia veľkosť ZIP súborov"
 msgid "Save"
 msgstr "Uložiť"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Nový"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Nový textový súbor"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Textový súbor"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Priečinok"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Zmazané súbory"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Zrušiť odosielanie"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Nemáte oprávnenie sem nahrávať alebo vytvoriť súbory"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Žiadny súbor. Nahrajte niečo!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Sťahovanie"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Zmazať"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Nahrávanie je príliš veľké"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbory, ktoré sa snažíte nahrať, presahujú maximálnu veľkosť pre nahratie súborov na tento server."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Čakajte, súbory sú prehľadávané."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Práve prezerané"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Aktualizujem medzipamäť súborového systému..."
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index 36c34248e2..a57f418836 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-12-02 13:30+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,18 +82,18 @@ msgid ""
 "administrator"
 msgstr "Neznáma chyba, skontrolujte si vaše systémové nastavenia alebo kontaktujte administrátora"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Chýbajúce požiadavky."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Nasledujúci používatelia nie sú nastavení pre šifrovanie:"
 
@@ -101,9 +101,9 @@ msgstr "Nasledujúci používatelia nie sú nastavení pre šifrovanie:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Ukladám..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 24ef5a545f..5ac968e0c4 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Prístup povolený"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Chyba pri konfigurácii úložiska Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Povoliť prístup"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Zadajte platný kľúč aplikácie a heslo Dropbox"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba pri konfigurácii úložiska Google drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Upozornenie:</b> \"smbclient\" nie je nainštalovaný. Nie je možné pripojenie oddielov CIFS/SMB. Požiadajte administrátora systému, nech ho nainštaluje."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Upozornenie:</b> Podpora FTP v PHP nie je povolená alebo nainštalovaná. Nie je možné pripojenie oddielov FTP. Požiadajte administrátora systému, nech ho nainštaluje."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Používatelia"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Zmazať"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Povoliť externé úložisko"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Povoliť používateľom pripojiť si vlastné externé úložisko"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Koreňové SSL certifikáty"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importovať koreňový certifikát"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 9822b994dc..74a307337e 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Zdieľa {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Toto zdieľanie je chránené heslom"
@@ -54,32 +58,16 @@ msgstr "zdieľanie je zakázané"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s zdieľa s vami priečinok %s"
+msgid "shared by %s"
+msgstr "Zdieľa %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s zdieľa s vami súbor %s"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Sťahovanie"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Nahrať"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Zrušiť nahrávanie"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Žiaden náhľad k dispozícii pre"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Priama linka"
diff --git a/l10n/sk_SK/files_trashbin.po b/l10n/sk_SK/files_trashbin.po
index 6aad589b16..4f4d9bc61a 100644
--- a/l10n/sk_SK/files_trashbin.po
+++ b/l10n/sk_SK/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nemožno zmazať %s navždy"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Nemožno obnoviť %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Zmazané súbory"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Chyba"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "obnovené"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Žiadny obsah. Kôš je prázdny!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Názov"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Obnoviť"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Zmazané"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Zmazať"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Zmazané súbory"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index b33bb89f20..41d6fb6139 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,38 +19,38 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Aplikácia \"%s\" nemôže byť nainštalovaná kvôli nekompatibilite z touto verziou ownCloudu."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Nešpecifikované meno aplikácie"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Pomoc"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Osobné"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Používatelia"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Administrátor"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Zlyhala aktualizácia \"%s\"."
@@ -63,15 +63,10 @@ msgstr "Neznámy typ súboru"
 msgid "Invalid image"
 msgstr "Chybný obrázok"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "webové služby pod Vašou kontrolou"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "nemožno otvoriť \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Sťahovanie súborov ZIP je vypnuté."
@@ -94,74 +89,78 @@ msgid ""
 "administrator."
 msgstr "Prosím, stiahnite si súbory samostatne v menších blokoch alebo sa obráťte na správcu."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Nešpecifikovaný zdroj pri inštalácii aplikácie"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Nešpecifikovaný atribút \"href\" pri inštalácii aplikácie pomocou protokolu \"http\""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Nešpecifikovaná cesta pri inštalácii aplikácie z lokálneho súboru"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Tento typ archívu %s nie je podporovaný"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Zlyhanie pri otváraní archívu počas inštalácie aplikácie"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Aplikácia neposkytuje súbor info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Aplikácia nemôže byť nainštalovaná pre nepovolený kód v aplikácii"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Aplikácia nemôže byť nainštalovaná pre nekompatibilitu z touto verziou ownCloudu"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Aplikácia nemôže byť nainštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Aplikácia nemôže byť nainštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v obchode s aplikáciami"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Aplikačný priečinok už existuje"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Nemožno vytvoriť aplikačný priečinok. Prosím upravte povolenia. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Aplikácia nie je zapnutá"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Chyba autentifikácie"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token vypršal. Obnovte, prosím, stránku."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Súbory"
@@ -201,8 +200,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Musíte zadať jestvujúci účet alebo administrátora."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Používateľské meno a/alebo heslo pre MySQL databázu je neplatné"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -229,21 +228,21 @@ msgstr "Podozrivý príkaz bol: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Používateľ '%s'@'localhost' už v MySQL existuje."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Zahodiť používateľa z MySQL."
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Používateľ '%s'@'%%' už v MySQL existuje"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Zahodiť používateľa z MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -270,70 +269,76 @@ msgstr "Zadajte používateľské meno administrátora."
 msgid "Set an admin password."
 msgstr "Zadajte heslo administrátora."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s s vami zdieľa »%s«"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Nemožno nájsť danú kategóriu \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "pred %n minútou"
 msgstr[1] "pred %n minútami"
 msgstr[2] "pred %n minútami"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "pred %n hodinou"
 msgstr[1] "pred %n hodinami"
 msgstr[2] "pred %n hodinami"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "dnes"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "včera"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "pred %n dňom"
 msgstr[1] "pred %n dňami"
 msgstr[2] "pred %n dňami"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "minulý mesiac"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "pred %n mesiacom"
 msgstr[1] "pred %n mesiacmi"
 msgstr[2] "pred %n mesiacmi"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "minulý rok"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "pred rokmi"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 226ab6392c..32ec5e902e 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013
+# mhh <marian.hvolka@stuba.sk>, 2013-2014
 # martin, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-16 13:50+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,48 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email odoslaný"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Šifrovanie"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Nie je možné nahrať zoznam z App Store"
@@ -115,62 +157,90 @@ msgstr "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používate
 msgid "Unable to change password"
 msgstr "Zmena hesla sa nepodarila"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Príručka používateľa"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Aktualizovať na {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Zakázať"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Zapnúť"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Čakajte prosím..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
-msgstr "Chyba pri zablokovaní aplikácie"
+msgstr "Chyba pri zakázaní aplikácie"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Chyba pri povoľovaní aplikácie"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Aktualizujem..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "chyba pri aktualizácii aplikácie"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Chyba"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Aktualizované"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Vybrať avatara"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Ukladám..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "zmazané"
@@ -183,40 +253,40 @@ msgstr "vrátiť"
 msgid "Unable to remove user"
 msgstr "Nemožno odobrať používateľa"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Skupiny"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Správca skupiny"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Zmazať"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "pridať skupinu"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Musíte zadať platné používateľské meno"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Chyba pri vytváraní používateľa"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Musíte zadať platné heslo"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Slovensky"
 
@@ -240,18 +310,42 @@ msgstr "Chyby a fatálne problémy"
 msgid "Fatal issues only"
 msgstr "Len fatálne problémy"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Žiadny"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Prihlásenie"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Bezpečnostné upozornenie"
 
-#: templates/admin.php:25
+#: 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 "Do %s máte prístup cez HTTP. Dôrazne odporúčame nakonfigurovať server tak, aby namiesto toho vyžadoval použitie HTTPS."
 
-#: templates/admin.php:39
+#: 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 "
@@ -260,68 +354,68 @@ msgid ""
 "root."
 msgstr "Váš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný, alebo presunúť priečinok s dátami mimo priestor sprístupňovaný webovým serverom."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Nastavenia oznámení"
 
-#: templates/admin.php:53
+#: 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 nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Skontrolujte prosím znovu <a href=\"%s\">inštalačnú príručku</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Chýba modul 'fileinfo'"
 
-#: templates/admin.php:68
+#: 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 "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Vaša PHP verzia je zastaraná"
 
-#: templates/admin.php:82
+#: 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 "Táto verzia PHP je zastaraná. Dôrazne vám odporúčame aktualizovať na verziu 5.3.8 alebo novšiu, lebo staršie verzie sú chybné. Je možné, že táto instalácia nebude fungovat správne."
+msgstr "Táto verzia PHP je zastaraná. Dôrazne vám odporúčame aktualizovať na verziu 5.3.8 alebo novšiu, lebo staršie verzie sú chybné. Je možné, že táto inštalácia nebude fungovať správne."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Lokalizácia nefunguje"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov."
 
-#: templates/admin.php:106
+#: 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ôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Pripojenie na internet nefunguje"
 
-#: templates/admin.php:121
+#: 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 "
@@ -330,118 +424,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Prístup k súborom z iných miest a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky vlastnosti ownCloudu, odporúčame povoliť pripojenie k internetu tomuto serveru."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Vykonať jednu úlohu s každým načítaní stránky"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Použite systémovú službu cron, ktorá zavolá súbor cron.php každých 15 minút."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Zdieľanie"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Povoliť API zdieľania"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Povoliť aplikáciám používať API na zdieľanie"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Povoliť odkazy"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Povoliť používateľom zdieľať položky pre verejnosť cez odkazy"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Povoliť verejné nahrávanie súborov"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Povoliť používateľom umožniť iným používateľom nahrávať do ich zdieľaného priečinka"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Povoliť zdieľanie ďalej"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Povoliť používateľom ďalej zdieľať zdieľané položky"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Povoliť používateľom zdieľať s kýmkoľvek"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Povoliť používateľom zdieľať len s používateľmi v ich skupinách"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
-msgstr "Povoliť upozornenia emailom"
+msgstr "Povoliť odosielať upozornenia emailom"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
-msgstr "Povoliť používateľom upozornenia emailom pre svoje zdieľané súbory"
+msgstr "Povoliť používateľom odosielať upozornenia emailom pre svoje zdieľané súbory"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Zabezpečenie"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Vynútiť HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Vynúti pripájanie klientov k %s šifrovaným pripojením."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Adresa servera"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Prihlasovanie údaje"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Úroveň záznamu"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Viac"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Menej"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Verzia"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -451,30 +605,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Pridať vašu aplikáciu"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Viac aplikácií"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Vyberte aplikáciu"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Pozrite si stránku aplikácií na apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Príručka používateľa"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Príručka administrátora"
@@ -508,163 +666,161 @@ msgstr "Znovu zobraziť sprievodcu prvým spustením"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných "
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Heslo"
 
 #: templates/personal.php:40
 msgid "Your password was changed"
-msgstr "Heslo bolo zmenené"
+msgstr "Vaše heslo bolo zmenené"
 
 #: templates/personal.php:41
 msgid "Unable to change your password"
 msgstr "Nie je možné zmeniť vaše heslo"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Aktuálne heslo"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nové heslo"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Meno a priezvisko"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Vaša emailová adresa"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Vyplňte emailovú adresu pre aktivovanie obnovy hesla"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Avatar"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Nahrať nový"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Vyberte nový zo súborov"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Zmazať obrázok"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr "Buď png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať."
+msgstr "Formát súboru png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
-msgstr "Váš avatar je použiý z pôvodného účtu."
+msgstr "Váš avatar je použitý z pôvodného účtu."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Prerušiť"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Zrušiť"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Vybrať ako avatara"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Jazyk"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Pomôcť s prekladom"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Šifrovanie"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory."
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Prihlasovacie heslo"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Dešifrovať všetky súbory"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Prihlasovacie meno"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Vytvoriť"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Obnovenie hesla administrátora"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Predvolené úložisko"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Prosím zadajte kvótu úložného priestoru (napr.: \"512 MB​​\" alebo \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Nelimitované"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Iné"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
-msgstr "Meno používateľa"
+msgstr "Používateľské meno"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Úložisko"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "zmeniť meno a priezvisko"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "nastaviť nové heslo"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Predvolené"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 314d24e826..2359384c65 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mhh <marian.hvolka@stuba.sk>, 2013
+# mhh <marian.hvolka@stuba.sk>, 2013-2014
 # martin, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,43 +88,43 @@ msgstr "Úspešné"
 msgid "Error"
 msgstr "Chyba"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
-msgstr "Konfigurácia je vporiadku"
+msgstr "Konfigurácia je v poriadku"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Nesprávna konfigurácia"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Nekompletná konfigurácia"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Vybrať skupinu"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Vyberte triedy objektov"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Vyberte atribúty"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Test pripojenia bol úspešný"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Test pripojenia zlyhal"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Naozaj chcete zmazať súčasné nastavenie servera?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Potvrdiť vymazanie"
 
@@ -144,11 +144,11 @@ msgstr[0] "%s nájdený používateľ"
 msgstr[1] "%s nájdení používatelia"
 msgstr[2] "%s nájdených používateľov"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Neplatný hostiteľ"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Nemožno nájsť požadovanú funkciu"
 
@@ -166,8 +166,8 @@ msgstr "Pomoc"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Obmedziť prístup %s do skupiny, ktoré spĺňajú tieto kritériá:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -202,8 +202,8 @@ msgid "groups found"
 msgstr "nájdené skupiny"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Ako prihlasovacie meno použiť atribút:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -222,7 +222,7 @@ msgstr "Iné atribúty:"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action. Example: \"uid=%%uid\""
-msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\""
+msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\""
 
 #: templates/part.wizard-server.php:18
 msgid "Add Server Configuration"
@@ -235,7 +235,7 @@ msgstr "Hostiteľ"
 #: templates/part.wizard-server.php:31
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "Môžete vynechať protokol, s výnimkou požadovania SSL. Vtedy začnite s ldaps://"
+msgstr "Môžete vynechať protokol, okrem prípadu, kedy sa vyžaduje SSL. Vtedy začnite s ldaps://"
 
 #: templates/part.wizard-server.php:36
 msgid "Port"
@@ -270,8 +270,8 @@ msgstr "V rozšírenom nastavení môžete zadať základné DN pre používate
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Obmedziť prístup k %s na používateľov, ktorí spĺňajú tieto kritériá:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -302,7 +302,7 @@ msgstr "<b>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
-msgstr "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požádejte administrátora systému aby ho nainštaloval."
+msgstr "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požiadajte administrátora systému, aby ho nainštaloval."
 
 #: templates/settings.php:20
 msgid "Connection Settings"
@@ -355,7 +355,7 @@ msgstr "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje i
 
 #: templates/settings.php:28
 msgid "Cache Time-To-Live"
-msgstr "Životnosť objektov v medzipamäti"
+msgstr "Životnosť objektov vo vyrovnávacej pamäti"
 
 #: templates/settings.php:28
 msgid "in seconds. A change empties the cache."
@@ -363,11 +363,11 @@ msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
 
 #: templates/settings.php:30
 msgid "Directory Settings"
-msgstr "Nastavenie priečinka"
+msgstr "Nastavenia priečinka"
 
 #: templates/settings.php:32
 msgid "User Display Name Field"
-msgstr "Pole pre zobrazenie mena používateľa"
+msgstr "Pole pre zobrazované meno používateľa"
 
 #: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the user's display name."
@@ -413,41 +413,51 @@ msgstr "Atribúty vyhľadávania skupín"
 msgid "Group-Member association"
 msgstr "Priradenie člena skupiny"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Špeciálne atribúty"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Pole kvóty"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Predvolená kvóta"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "v bajtoch"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Pole emailu"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Pravidlo pre nastavenie názvu používateľského priečinka dát"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD."
+msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút z LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Interné používateľské meno"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,17 +471,17 @@ msgid ""
 "behavior as before ownCloud 5 enter the user display name attribute in the "
 "following field. Leave it empty for default behavior. Changes will have "
 "effect only on newly mapped (added) LDAP users."
-msgstr "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby * DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov."
+msgstr "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby *DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atribút interného používateľského mena:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Prepísať UUID detekciu"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,21 +490,21 @@ msgid ""
 "You must make sure that the attribute of your choice can be fetched for both"
 " users and groups and it is unique. Leave it empty for default behavior. "
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
-msgstr "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné použivateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri použivateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP."
+msgstr "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné používateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri používateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID atribút pre používateľov:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID atribút pre skupiny:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Mapovanie názvov LDAP používateľských mien"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,12 +516,12 @@ msgid ""
 " is not configuration sensitive, it affects all LDAP configurations! Never "
 "clear the mappings in a production environment, only in a testing or "
 "experimental stage."
-msgstr "Použivateľské mená sa používajú pre uchovávanie a priraďovanie (meta)dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapování vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze."
+msgstr "Používateľské mená sa používajú pre uchovávanie a priraďovanie (meta) dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapovaní vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Zrušiť mapovanie LDAP používateľských mien"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Zrušiť mapovanie názvov LDAP skupín"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index b3e3200858..09cb6a21f4 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -8,9 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-08-09 07:59-0400\n"
-"PO-Revision-Date: 2013-08-07 19:50+0000\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-01-14 21:42+0000\n"
 "Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 4d04d18975..e3285d025c 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013
+# mateju <>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
+"PO-Revision-Date: 2014-03-29 20:30+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,41 +19,27 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s je omogočil souporabo »%s«"
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
+msgstr "Datum preteka je v preteklosti."
 
-#: ajax/share.php:169
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Ni mogoče poslati sporočila za: %s"
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr "Vzdrževalni način je omogočen"
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr "Vzdrževalni način je onemogočen"
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 msgid "Updated database"
 msgstr "Posodobljena podatkovna zbirka"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Poteka posodabljanje predpomnilnika datotek. Opravilo je lahko dolgotrajno ..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Predpomnilnik datotek je posodobljen"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% končano ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ni podane datoteke ali slike"
@@ -74,91 +60,95 @@ msgstr "Na voljo ni nobene začasne slike za profil. Poskusite znova."
 msgid "No crop data provided"
 msgstr "Ni podanih podatkov obreza"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "nedelja"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "torek"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "sreda"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "četrtek"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "petek"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "sobota"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "januar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "februar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "marec"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "april"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "maj"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "junij"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "julij"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "avgust"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "september"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "november"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "december"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:869
+#: js/js.js:543
+msgid "Saving..."
+msgstr "Poteka shranjevanje ..."
+
+#: js/js.js:1103
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:870
+#: js/js.js:1104
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "pred %n minuto"
@@ -166,7 +156,7 @@ msgstr[1] "pred %n minutama"
 msgstr[2] "pred %n minutami"
 msgstr[3] "pred %n minutami"
 
-#: js/js.js:871
+#: js/js.js:1105
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "pred %n uro"
@@ -174,15 +164,15 @@ msgstr[1] "pred %n urama"
 msgstr[2] "pred %n urami"
 msgstr[3] "pred %n urami"
 
-#: js/js.js:872
+#: js/js.js:1106
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:873
+#: js/js.js:1107
 msgid "yesterday"
 msgstr "včeraj"
 
-#: js/js.js:874
+#: js/js.js:1108
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "pred %n dnevom"
@@ -190,11 +180,11 @@ msgstr[1] "pred %n dnevoma"
 msgstr[2] "pred %n dnevi"
 msgstr[3] "pred %n dnevi"
 
-#: js/js.js:875
+#: js/js.js:1109
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:876
+#: js/js.js:1110
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "pred %n mesecem"
@@ -202,15 +192,15 @@ msgstr[1] "pred %n mesecema"
 msgstr[2] "pred %n meseci"
 msgstr[3] "pred %n meseci"
 
-#: js/js.js:877
+#: js/js.js:1111
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:878
+#: js/js.js:1112
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:879
+#: js/js.js:1113
 msgid "years ago"
 msgstr "let nazaj"
 
@@ -280,6 +270,26 @@ msgstr "({count} izbranih)"
 msgid "Error loading file exists template"
 msgstr "Napaka nalaganja predloge obstoječih datotek"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Zelo šibko geslo"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Šibko geslo"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Slabo geslo"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "Dobro geslo"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Odlično geslo"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "V souporabi"
@@ -288,12 +298,12 @@ msgstr "V souporabi"
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Napaka"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
@@ -305,123 +315,123 @@ msgstr "Napaka med odstranjevanjem souporabe"
 msgid "Error while changing permissions"
 msgstr "Napaka med spreminjanjem dovoljenj"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}."
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "V souporabi z vami. Lastnik je {owner}."
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Souporaba z uporabnikom ali skupino ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Povezava za prejem"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Zaščiti z geslom"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Geslo"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Dovoli javno pošiljanje na strežnik"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Posreduj povezavo po elektronski pošti"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Pošlji"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Nastavi datum preteka"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Datum preteka"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Pošlji povezavo do dokumenta preko elektronske pošte:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Ni najdenih uporabnikov"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "skupina"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Nadaljnja souporaba ni dovoljena"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "V souporabi v {item} z uporabnikom {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Prekliči souporabo"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "obvesti po elektronski pošti"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "lahko ureja"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "nadzor dostopa"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "ustvari"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "posodobi"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "izbriše"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "določi souporabo"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Zaščiteno z geslom"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Napaka nastavljanja datuma preteka"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Pošiljanje ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Elektronska pošta je poslana"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Opozorilo"
 
@@ -468,11 +478,17 @@ msgstr "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "Ponastavitev gesla %s"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "Prišlo je do napake med pošiljanjem elektronskega sporočila. Stopite v stik s skrbnikom sistema."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Za ponastavitev gesla uporabite povezavo: {link}"
@@ -492,8 +508,8 @@ msgstr "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabnišk
 msgid "You will receive a link to reset your password via Email."
 msgstr "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Uporabniško ime"
 
@@ -529,6 +545,18 @@ msgstr "Novo geslo"
 msgid "Reset password"
 msgstr "Ponastavi geslo"
 
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! "
+
+#: setup/controller.php:144
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Osebno"
@@ -537,7 +565,7 @@ msgstr "Osebno"
 msgid "Users"
 msgstr "Uporabniki"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Programi"
 
@@ -647,49 +675,47 @@ msgstr "Za več informacij o pravilnem nastavljanju strežnika, kliknite na pove
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ustvari <strong>skrbniški račun</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Napredne možnosti"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Shramba in podatkovna zbirka"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Podatkovna mapa"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Nastavi podatkovno zbirko"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "bo uporabljen"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Uporabnik podatkovne zbirke"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Geslo podatkovne zbirke"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Ime podatkovne zbirke"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Razpredelnica podatkovne zbirke"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Gostitelj podatkovne zbirke"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Končaj nastavitev"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Poteka zaključevanje opravila ..."
 
@@ -705,7 +731,7 @@ msgstr "Program zahteva omogočeno skriptno podporo. Za pravilno delovanje je tr
 msgid "%s is available. Get more information on how to update."
 msgstr "%s je na voljo. Pridobite več podrobnosti za posodobitev."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Odjava"
 
@@ -731,28 +757,28 @@ msgstr "Overitev s strežnika je spodletela!"
 msgid "Please contact your administrator."
 msgstr "Stopite v stik s skrbnikom sistema."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Ali ste pozabili geslo?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "zapomni si"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Prijava"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Druge prijavne možnosti"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Pozdravljeni,<br><br>oseba %s vam je omogočila souporabo %s.<br>Vir si lahko ogledate na <a href=\"%s\">tem naslovu</a>.<br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 83b375f340..9966a2785b 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013
+# mateju <>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-22 01:55-0500\n"
-"PO-Revision-Date: 2013-12-21 21:20+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,202 +19,215 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Datoteke %s ni mogoče premakniti  - datoteka s tem imenom že obstaja."
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Datoteke %s ni mogoče premakniti"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Ime datoteke ne sme biti prazno polje."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Ime datoteke ne sme vsebovati znaka \"/\". Določiti je treba drugo ime."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "\"%s\" je neveljavno ime datoteke."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "Ciljna mapa je premaknjena ali izbrisana."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Ime %s je že v mapi %s že v uporabi. Izbrati je treba drugo ime."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Vir ni veljaven"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Odpiranje naslovov URL preko strežnika ni dovoljeno. Preverite nastavitve strežnika."
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Napaka med prejemanjem %s v mapo %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Napaka med ustvarjanjem datoteke"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Ime mape ne more biti prazna vrednost."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Ime mape ne sme vsebovati znaka \"/\". Določiti je treba drugo ime."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Napaka med ustvarjanjem mape"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Mapo, v katero boste prenašali dokumente, ni mogoče določiti"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Neveljaven žeton"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ni poslane datoteke. Neznana napaka."
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je uspešno naložena."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML."
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslan je le del datoteke."
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Ni poslane datoteke"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Manjka začasna mapa"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Pisanje na disk je spodletelo"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Na voljo ni dovolj prostora"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Pošiljanje je spodletelo. Ni mogoče najti poslane datoteke."
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Neveljavna mapa."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov."
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Na voljo ni dovolj prostora."
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Skupna velikost {size1} presega omejitev velikosti {size2}"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}."
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Pošiljanje je preklicano."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Ni mogoče pridobiti podatkov s strežnika."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "Polje naslova URL ne sme biti prazno"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "V domači mapi ni dovoljeno ustvariti mape z imenom 'Souporabe', saj je ime  zadržano za javno mapo."
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} že obstaja"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Ni mogoče ustvariti datoteke"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Ni mogoče ustvariti mape"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Napaka pridobivanja naslova URL"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Souporaba"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Izbriši dokončno"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "V čakanju ..."
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Ni mogoče preimenovati datoteke"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "preimenovano ime {new_name} z imenom {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Napaka brisanja datoteke."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapa"
@@ -222,7 +235,7 @@ msgstr[1] "%n mapi"
 msgstr[2] "%n mape"
 msgstr[3] "%n map"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n datoteka"
@@ -230,11 +243,11 @@ msgstr[1] "%n datoteki"
 msgstr[2] "%n datoteke"
 msgstr[3] "%n datotek"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} in {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Posodabljanje %n datoteke"
@@ -242,66 +255,60 @@ msgstr[1] "Posodabljanje %n datotek"
 msgstr[2] "Posodabljanje %n datotek"
 msgstr[3] "Posodabljanje %n datotek"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' je neveljavno ime datoteke."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" je neveljavno ime datoteke."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Program za šifriranje je omogočen, vendar ni začet. Odjavite se in nato ponovno prijavite."
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ni ustreznega osebnega ključa za program za šifriranje. Posodobite osebni ključ za dostop do šifriranih datotek med nastavitvami."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Šifriranje je onemogočeno, datoteke pa so še vedno šifrirane. Odšifrirajte jih med nastavitvami."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Postopek priprave datoteke za prejem je lahko dolgotrajen, kadar je datoteka zelo velika."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Napaka premikanja datoteke"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Napaka"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Spremenjeno"
 
@@ -309,12 +316,12 @@ msgstr "Spremenjeno"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Neveljavno ime mape. Ime 'Souporaba' je zadržana za javno mapo."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s ni mogoče preimenovati"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Pošlji"
 
@@ -350,72 +357,68 @@ msgstr "Največja vhodna velikost za datoteke ZIP"
 msgid "Save"
 msgstr "Shrani"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Novo"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Nova besedilna datoteka"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Besedilna datoteka"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Mapa"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Iz povezave"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Izbrisane datoteke"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Prekliči pošiljanje"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Ni ustreznih dovoljenj za pošiljanje ali ustvarjanje datotek na tem mestu."
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Prekoračenje omejitve velikosti"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke, ki jih želite poslati, presegajo največjo dovoljeno velikost na strežniku."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Poteka preučevanje datotek, počakajte ..."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Trenutno poteka preučevanje"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Nadgrajevanje predpomnilnika datotečnega sistema ..."
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index 958c659739..dc3211d8a7 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013
+# mateju <>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-11-29 23:30+0000\n"
+"POT-Creation-Date: 2014-03-15 02:13-0400\n"
+"PO-Revision-Date: 2014-03-14 19:21+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -82,18 +82,18 @@ msgid ""
 "administrator"
 msgstr "Prišlo je do neznane napake. Preverite nastavitve sistema ali pa stopite v stik s skrbnikom sistema."
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Manjkajoče zahteve"
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Preverite, ali je na strežniku nameščen paket PHP 5.3.3 ali novejši, da je omogočen in pravilno nastavljen PHP OpenSSL. Z obstoječimi možnostmi šifriranje ni mogoče."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Navedeni uporabniki še nimajo nastavljenega šifriranja:"
 
@@ -101,9 +101,9 @@ msgstr "Navedeni uporabniki še nimajo nastavljenega šifriranja:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Poteka shranjevanje ..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "Začetno šifriranje je v teku ... Poskusite kasneje."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index deddf05668..b8a82d1425 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mateju <>, 2013
+# mateju <>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
+"POT-Creation-Date: 2014-03-15 02:13-0400\n"
+"PO-Revision-Date: 2014-03-14 19:30+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Dostop je odobren"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Napaka nastavljanja shrambe Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Odobri dostop"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Vpisati je treba veljaven ključ programa in kodo za Dropbox"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Napaka nastavljanja shrambe Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Shranjeno"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Opozorilo:</b> paket \"smbclient\" ni nameščen. Priklapljanje pogonov CIFS/SMB ne bo mogoče."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Opozorilo:</b> podpora FTP v PHP ni omogočena ali pa ni nameščena. Priklapljanje pogonov FTP zato ne bo mogoče."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Uporabniki"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Omogoči zunanjo uporabniško podatkovno shrambo"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe"
+msgid "Allow users to mount the following external storage"
+msgstr "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb."
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Korenska potrdila SSL"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Uvozi korensko potrdilo"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 8831af7422..151a1a65e5 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# mateju <>, 2013
+# mateju <>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
+"POT-Creation-Date: 2014-03-15 02:13-0400\n"
+"PO-Revision-Date: 2014-03-14 19:30+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Souporabo omogoča {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "To mesto je zaščiteno z geslom."
@@ -54,32 +58,16 @@ msgstr "souporaba je onemogočena."
 msgid "For more info, please ask the person who sent this link."
 msgstr "Za več podrobnosti stopite v stik s pošiljateljem te povezave."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "Oseba %s je določila mapo %s za souporabo"
+msgid "shared by %s"
+msgstr "souporabp omogoča %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "Oseba %s je določila datoteko %s za souporabo"
+msgid "Download %s"
+msgstr "Prejmi %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Prejmi"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Pošlji"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Prekliči pošiljanje"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Predogled ni na voljo za"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Neposredna povezava"
diff --git a/l10n/sl/files_trashbin.po b/l10n/sl/files_trashbin.po
index 47b8914bda..b15be4bfbf 100644
--- a/l10n/sl/files_trashbin.po
+++ b/l10n/sl/files_trashbin.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
+"POT-Creation-Date: 2014-03-15 02:13-0400\n"
+"PO-Revision-Date: 2014-03-15 05:40+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Datoteke %s ni mogoče trajno izbrisati."
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Ni mogoče obnoviti %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Izbrisane datoteke"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Napaka"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "obnovljeno"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Mapa smeti je prazna."
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Ime"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Obnovi"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Izbrisano"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Izbrisane datoteke"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 1a6921a702..b5a1d0e092 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013
+# mateju <>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-15 02:13-0400\n"
+"PO-Revision-Date: 2014-03-14 19:30+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,38 +19,38 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Programa \"%s\" ni mogoče namestiti, ker ni skladen s trenutno nameščeno različico oblaka ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Ni podanega imena programa"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Pomoč"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Osebno"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Uporabniki"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Skrbništvo"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Posodabljanje \"%s\" je spodletelo."
@@ -63,15 +63,10 @@ msgstr "Neznana vrsta datoteke"
 msgid "Invalid image"
 msgstr "Neveljavna slika"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "ni mogoče odpreti \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Prejemanje datotek v paketu ZIP je onemogočeno."
@@ -94,74 +89,78 @@ msgid ""
 "administrator."
 msgstr "Datoteke je treba prejeti ločeno v manjših paketih, ali pa je treba za pomoč prositi skrbnika."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Ni podanega vira med nameščenjem programa"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Ni podanega podatka naslova HREF med nameščenjem programa preko protokola HTTP."
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Ni podane poti med nameščenjem programa iz krajevne datoteke"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Arhivi vrste %s niso podprti"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Odpiranje arhiva je med nameščanjem spodletelo"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Program je brez datoteke info.xml"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Programa ni mogoče namestiti zaradi nedovoljene programske kode."
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Programa ni mogoče namestiti, ker ni skladen z trenutno nameščeno različico oblaka ownCloud."
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Programa ni mogoče namestiti, ker vsebuje oznako <shipped>potrditve</shipped>, ki pa ni dovoljena za javne programe."
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Program ni mogoče namestiti zaradi neustrezne različice datoteke info.xml. Ta ni enaka različici programa."
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Programska mapa že obstaja"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Programske mape ni mogoče ustvariti. Ni ustreznih dovoljenj. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Program ni omogočen"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Napaka overjanja"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Žeton je potekel. Stran je treba ponovno naložiti."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Neznan uporabnik"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Datoteke"
@@ -195,23 +194,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "Uporabniško ime ali geslo MS SQL ni veljavno: %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 "Prijaviti se je treba v obstoječi ali pa skrbniški račun."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Uporabniško ime ali geslo MySQL ni veljavno"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "Uporabniško ime ali geslo za MySQL/MariaDB ni veljavno"
 
 #: 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 "Napaka podatkovne zbirke: \"%s\""
@@ -220,30 +219,30 @@ msgstr "Napaka podatkovne zbirke: \"%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 "Napačni ukaz je: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Uporabnik MySQL '%s'@'localhost' že obstaja."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "Uporabnik podatkovne zbirke MySQL/MariaDB '%s'@'localhost' že obstaja."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Odstrani uporabnika iz podatkovne zbirke MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Odstrani uporabnika iz podatkovne zbirke MySQL/MariaDB"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Uporabnik MySQL '%s'@'%%' že obstaja."
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "Uporabnik podatkovne zbirke MySQL/MariaDB '%s'@'%%' že obstaja."
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Odstrani uporabnika iz podatkovne zbirke MySQL"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Odstrani uporabnika iz podatkovne zbirke MySQL/MariaDB."
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -258,7 +257,7 @@ msgstr "Uporabniško ime ali geslo Oracle ni veljavno"
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Napačni ukaz je: \"%s\", ime: %s, geslo: %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 "Uporabniško ime ali geslo PostgreSQL ni veljavno"
 
@@ -270,27 +269,33 @@ msgstr "Nastavi uporabniško ime skrbnika."
 msgid "Set an admin password."
 msgstr "Nastavi geslo skrbnika."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Preverite <a href='%s'>navodila namestitve</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s je omogočil souporabo »%s«"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kategorije \"%s\" ni mogoče najti."
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "pred %n minuto"
@@ -298,7 +303,7 @@ msgstr[1] "pred %n minutama"
 msgstr[2] "pred %n minutami"
 msgstr[3] "pred %n minutami"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "pred %n uro"
@@ -306,15 +311,15 @@ msgstr[1] "pred %n urama"
 msgstr[2] "pred %n urami"
 msgstr[3] "pred %n urami"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "danes"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "včeraj"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "pred %n dnevom"
@@ -322,11 +327,11 @@ msgstr[1] "pred %n dnevoma"
 msgstr[2] "pred %n dnevi"
 msgstr[3] "pred %n dnevi"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "pred %n mesecem"
@@ -334,10 +339,10 @@ msgstr[1] "pred %n mesecema"
 msgstr[2] "pred %n meseci"
 msgstr[3] "pred %n meseci"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "lansko leto"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "let nazaj"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 5df294c597..dbde28d85d 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013
+# mateju <>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-05 22:23-0500\n"
-"PO-Revision-Date: 2013-12-05 18:30+0000\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
+"PO-Revision-Date: 2014-03-29 20:50+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,54 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "Navedena je napačna vrednost za %s"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Shranjeno"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Elektronska pošta je poslana"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Način pošiljanja"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Šifriranje"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Način overitve"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Ni mogoče naložiti seznama iz programskega središča"
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20 changepassword/controller.php:55
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
 msgid "Authentication error"
 msgstr "Napaka med overjanjem"
 
@@ -86,91 +128,119 @@ msgstr "Uporabnika ni mogoče odstraniti iz skupine %s"
 msgid "Couldn't update app."
 msgstr "Programa ni mogoče posodobiti."
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr "Napačno geslo"
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr "Ni navedenega uporabnika"
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni."
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid ""
 "Wrong admin recovery password. Please check the password and try again."
 msgstr "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova."
 
-#: changepassword/controller.php:87
+#: changepassword/controller.php:81
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
 msgstr "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje."
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr "Ni mogoče spremeniti gesla"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Poteka pošiljanje ..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Uporabniška dokumentacija"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Skrbniška dokumentacija"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Posodobi na {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Onemogoči"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Omogoči"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Počakajte ..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Napaka onemogočanja programa"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Napaka omogočanja programa"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Poteka posodabljanje ..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Prišlo je do napake med posodabljanjem programa."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Napaka"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Posodobi"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Posodobljeno"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Izbor slike profila"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Zelo šibko geslo"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Šibko geslo"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Slabo geslo"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "Dobro geslo"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Odlično geslo"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Poteka shranjevanje ..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "izbrisano"
@@ -183,40 +253,40 @@ msgstr "razveljavi"
 msgid "Unable to remove user"
 msgstr "Uporabnika ni mogoče odstraniti"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Skupine"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Skrbnik skupine"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Izbriši"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "dodaj skupino"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Navedeno mora biti veljavno uporabniško ime"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Napaka ustvarjanja uporabnika"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Navedeno mora biti veljavno geslo"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja"
 
-#: personal.php:45 personal.php:46
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr "Slovenščina"
 
@@ -240,18 +310,42 @@ msgstr "Napake in usodne dogodke"
 msgid "Fatal issues only"
 msgstr "Le usodne dogodke"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Brez"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Prijava"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Besedilno"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "Upravljalnik NT LAN"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Varnostno opozorilo"
 
-#: templates/admin.php:25
+#: 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 "Dostop do %s poteka preko HTTP. Priporočljivo je nastaviti strežnik na privzeto uporabo varne povezave preko protokola HTTPS."
 
-#: templates/admin.php:39
+#: 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 "
@@ -260,68 +354,68 @@ msgid ""
 "root."
 msgstr "Vaša podatkovna mapa in datoteke so najverjetneje dosegljive preko interneta. Datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da podatkovna mapa ni prosto dostopna. To je mogoče zagotoviti tudi tako, da je mapa premaknjena iz neustrezne korenske v podrejeno mapo ."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Opozorilo nastavitve"
 
-#: templates/admin.php:53
+#: 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 "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Preverite <a href=\"%s\">vodnike namestitve</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Manjka modul 'fileinfo'."
 
-#: templates/admin.php:68
+#: 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 "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "Nameščena različica PHP je zastarela"
 
-#: templates/admin.php:82
+#: 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 "Nameščena različica PHP je zastarela. Priporočljivo je posodobiti namestitev na različico 5.3.8 ali novejše, saj starejše različice ne podpirajo vseh zmožnosti. Mogoče je, da namestitev ne deluje pravilno."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Jezikovne prilagoditve ne delujejo."
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8."
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek."
 
-#: templates/admin.php:106
+#: 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 "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s"
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Internetna povezava ne deluje."
 
-#: templates/admin.php:121
+#: 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 "
@@ -330,118 +424,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Na voljo ni delujoče internetne povezave. To pomeni, da nekaterih možnosti, kot so priklapljanje zunanje shrambe, obveščanja o posodobitvah in nameščanje programov tretje roke ni podprto. Dostop do datotek z oddaljenih mest in pošiljanje obvestil preko elektronske pošte je verjetno še vedno mogoče. Za omogočanje vseh zmožnosti mora biti vzpostavljena tudi ustrezna internetna povezava."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Periodično opravilo"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Izvedi eno nalogo z vsako naloženo stranjo."
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Souporaba"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Omogoči API souporabe"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Dovoli programom uporabo vmesnika API souporabe"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Dovoli povezave"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Uporabnikom dovoli souporabo predmetov z javnimi povezavami"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Dovoli javno pošiljanje datotek v oblak"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Dovoli uporabnikom, da omogočijo drugim uporabnikom, pošiljati datoteke v javno mapo."
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Dovoli nadaljnjo souporabo"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Uporabnikom dovoli nadaljnjo souporabo predmetov"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Uporabnikom dovoli souporabo s komerkoli"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Uporabnikom dovoli souporabo z ostalimi uporabniki njihove skupine"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Dovoli obvestila preko elektronske pošte"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Dovoli uporabniku poslati obvestila preko elektronske pošte za datoteke v souporabi"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Varnost"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Zahtevaj uporabo HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Vsili povezavo odjemalca z %s preko šifrirane povezave."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "Poštni strežnik"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Zahtevana je overitev"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Naslov strežnika"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Vrata"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Poverila"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "Uporabniško ime SMTP"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "Geslo SMTP"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "Preizkus nastavitev elektronske pošte"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "Pošlji elektronsko sporočilo"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Raven beleženja"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Več"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Manj"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Različica"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -451,30 +605,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Dodaj program"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Več programov"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Izbor programa"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Dokumentacija:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Obiščite spletno stran programa na apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Oglejte si spletno stran programa"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Uporabniška dokumentacija"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Skrbniška dokumentacija"
@@ -508,7 +666,7 @@ msgstr "Zaženi čarovnika prvega zagona"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora."
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Geslo"
 
@@ -520,151 +678,149 @@ msgstr "Geslo je spremenjeno"
 msgid "Unable to change your password"
 msgstr "Gesla ni mogoče spremeniti."
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Trenutno geslo"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Novo geslo"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Elektronski naslov"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Osebni elektronski naslov"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Slika profila"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Pošlji novo"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Izberi novo iz menija datotek"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Odstrani sliko"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Slika je lahko png ali jpg. Slika naj bo kvadratna, ni pa to pogoj, saj  jo bo mogoče obrezati."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Podoba je podana v izvornem računu."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "Prekini"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Prekliči"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Izberi kot sliko profila"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Sodelujte pri prevajanju"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>."
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Šifriranje"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke."
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Prijavno geslo"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Odšifriraj vse datoteke"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Prijavno ime"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Ustvari"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Obnovitev skrbniškega gesla"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Privzeta shramba"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Neomejeno"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Uporabniško ime"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Shramba"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "Spremeni polno ime"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "nastavi novo geslo"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Privzeto"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 276ce0e77e..222415e4d0 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # barbarak <barbarak@arnes.si>, 2013
-# mateju <>, 2013
+# mateju <>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-30 01:55-0400\n"
+"PO-Revision-Date: 2014-03-29 20:50+0000\n"
 "Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -88,43 +88,43 @@ msgstr "Uspešno končano."
 msgid "Error"
 msgstr "Napaka"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Nastavitev je ustrezna"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Nastavitev ni ustrezna"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Nastavitev je nepopolna"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Izberi skupine"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Izbor razredov predmeta"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Izbor atributov"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Preizkus povezave je uspešno končan."
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Preizkus povezave je spodletel."
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ali res želite izbrisati trenutne nastavitve strežnika?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Potrdi brisanje"
 
@@ -146,11 +146,11 @@ msgstr[1] "%s najdena uporabnika"
 msgstr[2] "%s najdeni uporabniki"
 msgstr[3] "%s najdenih uporabnikov"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Neveljaven gostitelj"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Želene zmožnosti ni mogoče najti"
 
@@ -168,8 +168,8 @@ msgstr "Pomoč"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Omeji dostop %s do skupin glede na kriterij:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -204,8 +204,8 @@ msgid "groups found"
 msgstr "najdenih skupin"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Kateri atribut naj bo uporabljen kot prijavno ime:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -272,8 +272,8 @@ msgstr "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Omeji dostop do %s uporabnikom, za katere velja kriterij:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -415,41 +415,51 @@ msgstr "Skupinski atributi iskanja"
 msgid "Group-Member association"
 msgstr "Povezava član-skupina"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "Gnezdene skupine"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Posebni atributi"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Polje količinske omejitve"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Privzeta količinska omejitev"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "v bajtih"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Polje elektronske pošte"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Pravila poimenovanja uporabniške osebne mape"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Programsko uporabniško ime"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -465,15 +475,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Privzeto je notranje uporabniško ime ustvarjeno na osnovi atributa UUID. To omogoča določitev uporabniškega imena kot enoličnega, zato znakov ni treba pretvarjati. Notranje ime je omejeno na standardne znake: [ a-zA-Z0-9_.@- ]. Morebitni drugi znaki so zamenjani z ustreznim ASCII znakom, ali pa so enostavno izpuščeni. V primeru sporov je prišteta ali odšteta številčna vrednost. Notranje uporabniško ime je uporabljeno za določanje uporabnika in je privzeto ime uporabnikove domače mape. Hkrati je tudi del oddaljenega naslova URL, na primer za storitve *DAV. S to nastavitvijo je prepisan privzet način delovanja. Pri različicah ownCloud, nižjih od 5.0, je podoben učinek mogoče doseči z vpisom prikaznega imena oziroma z neizpolnjenim (praznim) poljem te vrednosti. Spremembe bodo uveljavljene le za nove preslikane (dodane) uporabnike LDAP."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Programski atribut uporabniškega imena:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Prezri zaznavo UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -484,19 +494,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Privzeto je atribut UUID samodejno zaznan. Uporabljen je za določevanje uporabnikov LDAP in skupin. Notranje uporabniško ime je določeno prav na atributu UUID, če ni določeno drugače. To nastavitev je mogoče prepisati in poslati poljuben atribut. Zagotoviti je treba le, da je ta pridobljen kot enolični podatek za uporabnika ali skupino. Prazno polje določa privzeti način. Spremembe bodo vplivale na novo preslikane (dodane) uporabnike LDAP in skupine."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Atribut UUID za uporabnike:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Atribut UUID za skupine:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Uporabniška preslikava uporabniškega imena na LDAP"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -510,10 +520,10 @@ msgid ""
 "experimental stage."
 msgstr "Uporabniška imena so uporabljena za shranjevanje in dodeljevanje (meta) podatkov. Za natančno določanje in prepoznavanje uporabnikov je uporabljen sistem notranjega uporabniškega imena vsakega uporabnika LDAP. Ta možnost zahteva preslikavo uporabniškega imena v uporabnika LDAP in preslikano na njegov UUID. Sistem predpomni enolična imena za zmanjšanje odvisnosti LDAP, vendar pa ta podatek ni uporabljen za določevanje uporabnika. Če se enolično ime spremeni, se spremeni notranje uporabniško ime. Čiščenje preslikav pušča ostanke podatkov in vpliva na vse nastavitve LDAP! V delovnem okolju zato spreminjanje preslikav ni priporočljivo, možnost pa je na voljo za preizkušanje."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Izbriši preslikavo uporabniškega imena na LDAP"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Izbriši preslikavo skupine na LDAP"
diff --git a/l10n/sq/core.po b/l10n/sq/core.po
index 428cc6415b..adf1767891 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +19,11 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s ndau »%s« me ju"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -41,19 +40,6 @@ msgstr "Mënyra e mirëmbajtjes u çaktivizua"
 msgid "Updated database"
 msgstr "Database-i u azhurnua"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Po azhurnoj memorjen e skedarëve, mund të zgjasi pak..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Memorja e skedarëve u azhornua"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% u krye ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -74,135 +60,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "E djelë"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "E hënë"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "E martë"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "E mërkurë"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "E enjte"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "E premte"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "E shtunë"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Janar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Shkurt"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Prill"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Qershor"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Korrik"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Gusht"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Shtator"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Tetor"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Nëntor"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Dhjetor"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Parametra"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Duke ruajtur..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekonda më parë"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut më parë"
 msgstr[1] "%n minuta më parë"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n orë më parë"
 msgstr[1] "%n orë më parë"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "sot"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "dje"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n ditë më parë"
 msgstr[1] "%n ditë më parë"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n muaj më parë"
 msgstr[1] "%n muaj më parë"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "muaj më parë"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "vite më parë"
 
@@ -270,6 +260,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Ndarë"
@@ -278,12 +288,12 @@ msgstr "Ndarë"
 msgid "Share"
 msgstr "Nda"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Veprim i gabuar gjatë ndarjes"
 
@@ -295,123 +305,123 @@ msgstr "Veprim i gabuar gjatë heqjes së ndarjes"
 msgid "Error while changing permissions"
 msgstr "Veprim i gabuar gjatë ndryshimit të lejeve"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ndarë me ju dhe me grupin {group} nga {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Ndarë me ju nga {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Mbro me kod"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Kodi"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Lejo Ngarkimin Publik"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Dërgo email me lidhjen"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Dërgo"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Cakto datën e përfundimit"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Data e përfundimit"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Nda me email:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Nuk u gjet asnjë person"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grupi"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Rindarja nuk lejohet"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Ndarë në {item} me {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Hiq ndarjen"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "mund të ndryshosh"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "kontrollimi i hyrjeve"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "krijo"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "azhurno"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "elimino"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "nda"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Mbrojtur me kod"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Veprim i gabuar gjatë heqjes së datës së përfundimit"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Veprim i gabuar gjatë caktimit të datës së përfundimit"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Duke dërguar..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email-i u dërgua"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -458,11 +468,17 @@ msgstr "Azhurnimi dështoi. Ju lutemi njoftoni për këtë problem <a href=\"htt
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "Kodi i %s -it u rivendos"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Përdorni lidhjen në vijim për të rivendosur kodin: {link}"
@@ -482,8 +498,8 @@ msgstr "Kërkesa dështoi!<br>A u siguruat që email-i/përdoruesi juaj ishte i
 msgid "You will receive a link to reset your password via Email."
 msgstr "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Përdoruesi"
 
@@ -519,6 +535,18 @@ msgstr "Kodi i ri"
 msgid "Reset password"
 msgstr "Rivendos kodin"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personale"
@@ -527,7 +555,7 @@ msgstr "Personale"
 msgid "Users"
 msgstr "Përdoruesit"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "App"
 
@@ -637,49 +665,47 @@ msgstr "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj,
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krijo një <strong>llogari administruesi</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Të përparuara"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Emri i dosjes"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Konfiguro database-in"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "do të përdoret"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Përdoruesi i database-it"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Kodi i database-it"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Emri i database-it"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Tablespace-i i database-it"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Pozicioni (host) i database-it"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Mbaro setup-in"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -695,7 +721,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Dalje"
 
@@ -721,27 +747,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Ke humbur kodin?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "kujto"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Hyrje"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Hyrje alternative"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 782e93a6b9..10f0a0a3fc 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ard1t <ardit.dani@gmail.com>, 2014
 # Odeen <rapid_odeen@zoho.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,283 +19,290 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Nuk mund të zhvendoset %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Emri i skedarit nuk mund të jetë bosh."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "E pa mundur të vendoset dosja e ngarkimit"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Shenjë e gabuar"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Asnjë skedar nuk u dërgua. Gabim i pa njohur"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Skedari u ngarkua me sukses"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Skedari i ngarkuar tejkalon limitin hapsirës së lejuar në php.ini"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Skedari i ngarkuar tejlakon vlerën MAX_FILE_SIZE të përcaktuar në formën HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Skedari është ngakruar vetëm pjesërisht"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Asnjë skedar nuk është ngarkuar"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Mungon dosja e përkohshme"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Dështoi shkrimi në disk"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Hapsira e arkivimit e pamjaftueshme"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Dosje e pavlefshme"
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Skedarë"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Nuk ka hapsirë të nevojshme"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Ngarkimi u anullua"
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin"
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
-msgstr ""
+msgstr "URL-i nuk mund të jetë bosh"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} është ekzistues "
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
-msgstr ""
+msgstr "I pamundur krijimi i kartelës"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Ndaj"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Fshi përfundimisht"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Riemëro"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Në vijim"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "u zëvendësua {new_name} me {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "anullo"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dosje"
 msgstr[1] "%n dosje"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n skedar"
 msgstr[1] "%n skedarë"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} dhe {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Po ngarkoj %n skedar"
 msgstr[1] "Po ngarkoj %n skedarë"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' nuk është skedar i vlefshem."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Hapsira juaj e arkivimit është plot, skedarët nuk mund të përditësohen ose sinkronizohen!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Hapsira juaj e arkivimit është pothuajse në fund  ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Shkarkimi juaj është duke u përgatitur. Kjo mund të kërkojë kohë nëse skedarët janë të mëdhenj."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
-msgstr ""
+msgstr "Gabim lëvizjen dokumentave"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Gabim"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Emri"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Madhësia"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Ndryshuar"
 
@@ -302,12 +310,12 @@ msgstr "Ndryshuar"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "Nuk është i mundur riemërtimi i %s"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Ngarko"
 
@@ -343,72 +351,68 @@ msgstr "Maksimumi hyrës i skedarëve ZIP"
 msgid "Save"
 msgstr "Ruaj"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "E re"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Skedar tekst"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
-msgstr ""
+msgstr "Dosje e're"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Dosje"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Nga lidhja"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Skedarë të fshirë "
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Anullo ngarkimin"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Këtu nuk ka asgje. Ngarko dicka"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Shkarko"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Fshi"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Ngarkimi shumë i madh"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Skedarët që po mundoheni të ngarkoni e tejkalojnë madhësinë maksimale të lejuar nga serveri."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Skanerizimi i skedarit në proces. Ju lutem prisni."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Skanimi aktual"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Përditësimi i cache-se së sistemit në procesim..."
diff --git a/l10n/sq/files_encryption.po b/l10n/sq/files_encryption.po
index ef46b2cd31..fe70cc4dd2 100644
--- a/l10n/sq/files_encryption.po
+++ b/l10n/sq/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Duke ruajtur..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index 62b645b85d..4744e08c44 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Përdoruesit"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Elimino"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sq/files_sharing.po b/l10n/sq/files_sharing.po
index cd5a5fbb8a..492388cd80 100644
--- a/l10n/sq/files_sharing.po
+++ b/l10n/sq/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ard1t <ardit.dani@gmail.com>, 2014
 # Odeen <rapid_odeen@zoho.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,9 +19,13 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
-msgstr ""
+msgstr "Kjo pjesë është e mbrojtur me fjalëkalim"
 
 #: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
@@ -54,32 +59,16 @@ msgstr "ndarja është çaktivizuar"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s ndau me ju dosjen %s"
-
-#: templates/public.php:21
-#, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s ndau me ju skedarin %s"
-
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Shkarko"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Ngarko"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Anulo ngarkimin"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Shikimi paraprak nuk është i mundur për"
-
-#: templates/public.php:99
-msgid "Direct link"
+msgid "shared by %s"
 msgstr ""
+
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:48
+msgid "Direct link"
+msgstr "Lidhje direkte"
diff --git a/l10n/sq/files_trashbin.po b/l10n/sq/files_trashbin.po
index 64b4a4e742..9214ca6dec 100644
--- a/l10n/sq/files_trashbin.po
+++ b/l10n/sq/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Nuk munda ta eliminoj përfundimisht %s"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Nuk munda ta rivendos %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Skedarë të fshirë "
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Veprim i gabuar"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "rivendosur"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Këtu nuk ka asgjë. Koshi juaj është bosh!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Emri"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Rivendos"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Eliminuar"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Elimino"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Skedarë të eliminuar"
diff --git a/l10n/sq/files_versions.po b/l10n/sq/files_versions.po
index e4c86ec1c7..72ddcf8499 100644
--- a/l10n/sq/files_versions.po
+++ b/l10n/sq/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ard1t <ardit.dani@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-01-17 14:10+0000\n"
+"Last-Translator: ard1t <ardit.dani@gmail.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,24 +21,24 @@ msgstr ""
 #: ajax/rollbackVersion.php:13
 #, php-format
 msgid "Could not revert: %s"
-msgstr ""
+msgstr "Nuk mund të ktheje: %s"
 
-#: js/versions.js:7
+#: js/versions.js:14
 msgid "Versions"
-msgstr ""
+msgstr "Versioni"
 
-#: js/versions.js:53
+#: js/versions.js:60
 msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Dështoi në ktheje {skedar} të rishikimit {kohëstampe}."
 
-#: js/versions.js:79
+#: js/versions.js:87
 msgid "More versions..."
-msgstr ""
+msgstr "Versione m'shumë..."
 
-#: js/versions.js:116
+#: js/versions.js:125
 msgid "No other versions available"
-msgstr ""
+msgstr "Nuk ka versione të tjera në dispozicion"
 
-#: js/versions.js:149
+#: js/versions.js:155
 msgid "Restore"
 msgstr "Rivendos"
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 70e3092552..9588cd4785 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Ndihmë"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personale"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Parametra"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Përdoruesit"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "shërbime web nën kontrollin tënd"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Shkarimi i skedarëve ZIP është i çaktivizuar."
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Programi nuk është i aktivizuar."
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Veprim i gabuar gjatë vërtetimit të identitetit"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Përmbajtja ka skaduar. Ju lutemi ringarkoni faqen."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Skedarët"
@@ -199,8 +198,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm."
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -227,21 +226,21 @@ msgstr "Komanda e gabuar ishte: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Përdoruesi MySQL '%s'@'localhost' ekziston."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Eliminoni këtë përdorues nga MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Përdoruesi MySQL '%s'@'%%' ekziston"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Eliminoni këtë përdorues nga MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -268,66 +267,72 @@ msgstr "Cakto emrin e administratorit."
 msgid "Set an admin password."
 msgstr "Cakto kodin e administratorit."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s ndau »%s« me ju"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kategoria \"%s\" nuk u gjet"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekonda më parë"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n minuta më parë"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n orë më parë"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "sot"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "dje"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n ditë më parë"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "muajin e shkuar"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n muaj më parë"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "vitin e shkuar"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "vite më parë"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index 3eb24bfb8c..4cb82529cc 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email-i u dërgua"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "E pamundur të shkarkohet lista nga App Store"
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Dokumentacion përdoruesi"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Përditësim për {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Çaktivizo"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aktivizo"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Ju lutem prisni..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Duke përditësuar..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Gabim gjatë përditësimit të app"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Gabim"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Përditësim"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "I përditësuar"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Duke ruajtur..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "anullo veprimin"
 msgid "Unable to remove user"
 msgstr "E pamundur të fshiet përdoruesi"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupet"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Grupi Admin"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Fshi"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "shto grup"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Duhet të jepni një emër të vlefshëm përdoruesi"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Gabim gjatë krijimit të përdoruesit"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Duhet të jepni një fjalëkalim te vlefshëm"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Shqip"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Njoftim për sigurinë"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Lajmërim konfigurimi"
 
-#: templates/admin.php:53
+#: 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 "Web Serveri juaj nuk është konfigurar sic duhet në mënyre që të lejojë sinkronizimin e skedare pasi ndërfaqja WevDAV duket të jetë e demtuar."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Mungon moduli 'fileinfo'"
 
-#: templates/admin.php:68
+#: 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 "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Locale nuk është funksional"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Lidhja me internetin nuk është funksionale"
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Ndarje"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktivizo API për ndarjet"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Lejoni aplikacionet të përdorin share API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Lejo lidhjet"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Lejoni përdoruesit të ndajnë elementët publikisht nëpermjet lidhjeve"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Lejo ngarkimin publik"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Lejo përdoruesit të mundësojnë të tjerët që të ngarkojnë materiale në dosjen e tyre publike"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Lejo ri-ndarjen"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Lejoni përdoruesit të ndjanë dhe ata elementë të ndarë më parë ngë të tjerë"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Lejo përdoruesit të ndajnë me cilindo"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Lejoni përdoruesit të ndajnë vetëm me përdorues të të njëjtit grup"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Siguria"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Detyro HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Porta"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Historik aktiviteti"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Niveli i Historikut"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Më tepër"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
-msgstr ""
+msgstr "M'pak"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Versioni"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +603,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Zhvilluar nga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Komuniteti OwnCloud</a>, gjithashtu <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> është licensuar me anë të <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Shtoni apliakcionin tuaj"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Apliakcione të tjera"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Zgjidhni një Aplikacion"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Shihni faqen e aplikacionit tek apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensuar nga <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Dokumentacion përdoruesi"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Dokumentacion administratori"
@@ -506,7 +664,7 @@ msgstr "Rishfaq përsëri fazat për hapjen e herës së parë"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ju keni përdorur <strong>%s</strong> nga <strong>%s</strong> të mundshme "
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Fjalëkalim"
 
@@ -518,151 +676,149 @@ msgstr "fjalëkalimi juaj u ndryshua"
 msgid "Unable to change your password"
 msgstr "Nuk është e mundur të ndryshohet fjalëkalimi"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Fjalëkalimi aktual"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Fjalëkalimi i ri"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Ndrysho fjalëkalimin"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Adresa juaj email"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Jepni një adresë email për të aktivizuar rigjetjen e fjalëkalimit"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Anullo"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Gjuha"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Ndihmoni në përkthim"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Emri i Përdoruesit"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Krijo"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Rigjetja e fjalëkalimit të Admin"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Vendruajtje e paracaktuar/Default Storage"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "E pakufizuar"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Tjetër"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Përdoruesi"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Vendruajtja/Storage"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "vendos fjalëkalim të ri"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Paracaktuar"
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 89b59666e1..b8ed2aa551 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "Sukses"
 msgid "Error"
 msgstr "Gabim"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Prova e lidhjes përfundoi me sukses"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Prova e lidhjes dështoi"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Jeni vërtetë të sigurt të fshini konfigurimet aktuale të serverit?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Konfirmoni Fshirjen"
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "Ndihmë"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr "Ju mund të specifikoni Bazen DN për përdorues dhe grupe në butonin '
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr "Atributet e kërkimit të grupit"
 msgid "Group-Member association"
 msgstr "Pjestar Grup-Përdorues "
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Atribute të veçanta"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Hapsira e Kuotës"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Kuota e paracaktuar"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "në byte"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Hapsira e Postës Elektronike"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Rregulli i emërimit të dosjes së përdoruesit"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lëreni bosh për emrin e përdoruesit (I Paracaktuar). Ose, përcaktoni një atribut LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Emër i brëndshëm i përdoruesit"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Atributet e emrit të përdoruesit të brëndshëm"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Mbivendosni gjetjen e UUID"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Emri përdoruesit-LAPD përcaktues përdoruesi"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Fshini Emër përdoruesi-LAPD Përcaktues përdoruesi"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Fshini Emër Grupi-LADP Përcaktues grupi"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index a30a77a7c9..0b51c7f639 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,139 +58,143 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Недеља"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Понедељак"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Среда"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Петак"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Субота"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Јануар"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Фебруар"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Март"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Април"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Мај"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Јун"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Јул"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Август"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Септембар"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Октобар"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Новембар"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Децембар"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Поставке"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Чување у току..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "данас"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "јуче"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "месеци раније"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "прошле године"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "година раније"
 
@@ -273,6 +263,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -281,12 +291,12 @@ msgstr ""
 msgid "Share"
 msgstr "Дели"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Грешка"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Грешка у дељењу"
 
@@ -298,123 +308,123 @@ msgstr "Грешка код искључења дељења"
 msgid "Error while changing permissions"
 msgstr "Грешка код промене дозвола"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Дељено са вама и са групом {group}. Поделио {owner}."
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Поделио са вама {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Лозинка"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Пошаљи"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Постави датум истека"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Датум истека"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Подели поштом:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Особе нису пронађене."
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "група"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Поновно дељење није дозвољено"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Подељено унутар {item} са {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Укини дељење"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "може да мења"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "права приступа"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "направи"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "ажурирај"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "обриши"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "подели"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Грешка код поништавања датума истека"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Грешка код постављања датума истека"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Шаљем..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Порука је послата"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Упозорење"
 
@@ -461,11 +471,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Овом везом ресетујте своју лозинку: {link}"
@@ -485,8 +501,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Добићете везу за ресетовање лозинке путем е-поште."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Корисничко име"
 
@@ -522,6 +538,18 @@ msgstr "Нова лозинка"
 msgid "Reset password"
 msgstr "Ресетуј лозинку"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Лично"
@@ -530,7 +558,7 @@ msgstr "Лично"
 msgid "Users"
 msgstr "Корисници"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Апликације"
 
@@ -640,49 +668,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направи <strong>административни налог</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Напредно"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Фацикла података"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Подешавање базе"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "ће бити коришћен"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Корисник базе"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Лозинка базе"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Име базе"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Радни простор базе података"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Домаћин базе"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -698,7 +724,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Одјава"
 
@@ -724,27 +750,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Изгубили сте лозинку?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "упамти"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Пријава"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 5aee2a258b..eb157cd5a7 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,286 +17,293 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Не могу да преместим %s – датотека с овим именом већ постоји"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Не могу да преместим %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Име датотеке не може бити празно."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ниједна датотека није отпремљена услед непознате грешке"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Није дошло до грешке. Датотека је успешно отпремљена."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Датотека је делимично отпремљена"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Датотека није отпремљена"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Недостаје привремена фасцикла"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Не могу да пишем на диск"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Нема довољно простора"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "неисправна фасцикла."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Датотеке"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Нема довољно простора"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Отпремање је прекинуто."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} већ постоји"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Дели"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Обриши за стално"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Преименуј"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "На чекању"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "замењено {new_name} са {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "опозови"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "Датотека „.“ је неисправног имена."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване."
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше складиште је скоро па пуно ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Припремам преузимање. Ово може да потраје ако су датотеке велике."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Грешка"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Име"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Измењено"
 
@@ -304,12 +311,12 @@ msgstr "Измењено"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Отпреми"
 
@@ -345,72 +352,68 @@ msgstr "Највећа величина ZIP датотека"
 msgid "Save"
 msgstr "Сачувај"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Нова"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "текстуална датотека"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "фасцикла"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Са везе"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Обрисане датотеке"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Прекини отпремање"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Овде нема ничег. Отпремите нешто!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Датотека је превелика"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеке које желите да отпремите прелазе ограничење у величини."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Скенирам датотеке…"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Тренутно скенирање"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Дограђујем кеш система датотека…"
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index 4eb2ca4e3d..b072157e73 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Чување у току..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index 97c2ec3dbc..2077f942d6 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Корисници"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index cc5d524fb0..8a40c7c4bb 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Преузми"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Отпреми"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Прекини отпремање"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/sr/files_trashbin.po b/l10n/sr/files_trashbin.po
index e0b12d92e3..1af47be23e 100644
--- a/l10n/sr/files_trashbin.po
+++ b/l10n/sr/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Обрисане датотеке"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Грешка"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Овде нема ништа. Корпа за отпатке је празна."
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Име"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Врати"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Обриши"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 1e2a625e31..d2832922e6 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Помоћ"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Лично"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Поставке"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Корисници"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Администратор"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "веб сервиси под контролом"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Преузимање ZIP-а је искључено."
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Апликација није омогућена"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Грешка при провери идентитета"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Жетон је истекао. Поново учитајте страницу."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Датотеке"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,70 +267,76 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Погледајте <a href='%s'>водиче за инсталацију</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Не могу да пронађем категорију „%s“."
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "пре неколико секунди"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "данас"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "јуче"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "прошлог месеца"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "прошле године"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "година раније"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index fae3f55113..ea03c7d195 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Порука је послата"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Шифровање"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Грешка приликом учитавања списка из Складишта Програма"
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Корисничка документација"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Ажурирај на {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Искључи"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Омогући"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Сачекајте…"
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Ажурирам…"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Грешка при ажурирању апликације"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Грешка"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Ажурирај"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Ажурирано"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Чување у току..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "опозови"
 msgid "Unable to remove user"
 msgstr "Не могу да уклоним корисника"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Групе"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Управник групе"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Обриши"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "додај групу"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Морате унети исправно корисничко име"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Грешка при прављењу корисника"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Морате унети исправну лозинку"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ништа"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Пријави ме"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Сигурносно упозорење"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Упозорење о подешавању"
 
-#: templates/admin.php:53
+#: 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:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Недостаје модул „fileinfo“"
 
-#: templates/admin.php:68
+#: 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 "Недостаје PHP модул „fileinfo“. Препоручујемо вам да га омогућите да бисте добили најбоље резултате с откривањем MIME врста."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Локализација не ради"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Веза с интернетом не ради"
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Изврши један задатак са сваком учитаном страницом"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Дељење"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Омогући API Share"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Дозвољава апликацијама да користе API Share"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Дозволи везе"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Дозволи корисницима да деле ставке с другима путем веза"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Дозволи поновно дељење"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Дозволи корисницима да поновно деле ставке с другима"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Дозволи корисницима да деле са било ким"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Дозволи корисницима да деле само са корисницима у њиховим групама"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Безбедност"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Наметни HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Адреса сервера"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Порт"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Бележење"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Ниво бележења"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Више"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Мање"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Верзија"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +603,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Додајте ваш програм"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Више програма"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Изаберите програм"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Погледајте страницу са програмима на apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Корисничка документација"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Администраторска документација"
@@ -506,7 +664,7 @@ msgstr "Поново прикажи чаробњак за прво покрет
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Лозинка"
 
@@ -518,151 +676,149 @@ msgstr "Лозинка је промењена"
 msgid "Unable to change your password"
 msgstr "Не могу да изменим вашу лозинку"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Тренутна лозинка"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Нова лозинка"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Измени лозинку"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Е-пошта"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Ваша адреса е-поште"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Ун"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Откажи"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Језик"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr " Помозите у превођењу"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Шифровање"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Корисничко име"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Направи"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Подразумевано складиште"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Неограничено"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Друго"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Корисничко име"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Складиште"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "постави нову лозинку"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Подразумевано"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index e4b50474c1..d39190908f 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Грешка"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr "Помоћ"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -200,7 +200,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -268,7 +268,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -411,41 +411,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr "Придруживање чланова у групу"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "у бајтовима"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 14e62f885d..19ec071703 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# greatbalsa <balsa.l@live.com>, 2014
 # lemi667 <lemi667@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +19,11 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -40,19 +40,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -73,139 +60,143 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Petak"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Subota"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januar"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februar"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mart"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Jun"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Jul"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Avgust"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Septembar"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktobar"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Novembar"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Decembar"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "Pre par sekundi"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "Danas"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "juče"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Prije %n dan."
+msgstr[1] "Prije %n dana."
+msgstr[2] "Prije %n dana."
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "prošlog meseca"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "pre nekoliko meseci"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "prošle godine"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "pre nekoliko godina"
 
@@ -274,6 +265,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Deljeno"
@@ -282,12 +293,12 @@ msgstr "Deljeno"
 msgid "Share"
 msgstr "Podeli"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Greška"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Greška pri deljenju"
 
@@ -299,123 +310,123 @@ msgstr "Greška u uklanjanju deljenja"
 msgid "Error while changing permissions"
 msgstr "Greška u promeni dozvola"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} podelio sa Vama i grupom {group} "
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Sa vama podelio {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Pošalji link e-mailom"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Pošalji"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Deli putem e-maila"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Nema pronađenih ljudi"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Dalje deljenje nije dozvoljeno"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Deljeno u {item} sa {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Ukljoni deljenje"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "dozvoljene izmene"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "napravi"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "ažuriranje"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "brisanje"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "deljenje"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Zaštćeno lozinkom"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Greška u uklanjanju datuma isteka"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Greška u postavljanju datuma isteka"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Slanje..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email poslat"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -462,11 +473,17 @@ msgstr "Ažuriranje nije uspelo. Molimo obavestite <a href=\"https://github.com/
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Ažuriranje je uspelo. Prosleđivanje na ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Koristite sledeći link za reset lozinke: {link}"
@@ -486,8 +503,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "Dobićete vezu za resetovanje lozinke putem e-pošte."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Korisničko ime"
 
@@ -523,6 +540,18 @@ msgstr "Nova lozinka"
 msgid "Reset password"
 msgstr "Resetuj lozinku"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Lično"
@@ -531,7 +560,7 @@ msgstr "Lično"
 msgid "Users"
 msgstr "Korisnici"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Programi"
 
@@ -641,49 +670,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "Napravi <strong>administrativni nalog</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Napredno"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Fascikla podataka"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Podešavanje baze"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "će biti korišćen"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Korisnik baze"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Lozinka baze"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Ime baze"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "tablespace baze"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Domaćin baze"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -699,7 +726,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Odjava"
 
@@ -725,27 +752,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Izgubili ste lozinku?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "upamti"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
-msgstr ""
+msgstr "Prijavi se"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 04a77944eb..04923e4804 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,286 +17,293 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Nema greške, fajl je uspešno poslat"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslati fajl je samo delimično otpremljen!"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Nijedan fajl nije poslat"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena fascikla"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Fajlovi"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Podeli"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
-msgstr ""
+msgstr "Preimenij"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Greška"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Zadnja izmena"
 
@@ -304,12 +311,12 @@ msgstr "Zadnja izmena"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Pošalji"
 
@@ -345,72 +352,68 @@ msgstr ""
 msgid "Save"
 msgstr "Snimi"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema ničeg. Pošaljite nešto!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Pošiljka je prevelika"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index 08e33ab99d..11e2fec48d 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index d2e140796d..70156cba68 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "Korisnici"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 5b0b5a4f17..41dbd79a9a 100644
--- a/l10n/sr@latin/files_sharing.po
+++ b/l10n/sr@latin/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Preuzmi"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Pošalji"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/sr@latin/files_trashbin.po b/l10n/sr@latin/files_trashbin.po
index 54363eaf89..930dd474cc 100644
--- a/l10n/sr@latin/files_trashbin.po
+++ b/l10n/sr@latin/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Greška"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Ime"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Obriši"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 2a2686d0fb..9e437d4e7f 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-12 01:54-0400\n"
+"PO-Revision-Date: 2014-03-11 23:21+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Pomoć"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Lično"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Korisnici"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Adninistracija"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Greška pri autentifikaciji"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Fajlovi"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,70 +267,76 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "Pre par sekundi"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "Danas"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "juče"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
+msgstr[2] "Prije %n dana."
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "prošlog meseca"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "prošle godine"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "pre nekoliko godina"
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index e0cefa221d..61ac8239bc 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email poslat"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Greška"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupe"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Bezbednosno upozorenje"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Izaberite program"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Lozinka"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr "Ne mogu da izmenim vašu lozinku"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Trenutna lozinka"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Izmeni lozinku"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-mail"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Otkaži"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Jezik"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Napravi"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Korisničko ime"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 425b935c3c..bfe386afdc 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "Greška"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr "Pomoć"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -200,7 +200,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -268,7 +268,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -411,41 +411,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/su/core.po b/l10n/su/core.po
new file mode 100644
index 0000000000..a30711bcf7
--- /dev/null
+++ b/l10n/su/core.po
@@ -0,0 +1,796 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
+
+#: ajax/share.php:120 ajax/share.php:162
+#, php-format
+msgid "Couldn't send mail to following users: %s "
+msgstr ""
+
+#: ajax/update.php:11
+msgid "Turned on maintenance mode"
+msgstr ""
+
+#: ajax/update.php:14
+msgid "Turned off maintenance mode"
+msgstr ""
+
+#: ajax/update.php:17
+msgid "Updated database"
+msgstr ""
+
+#: avatar/controller.php:62
+msgid "No image or file provided"
+msgstr ""
+
+#: avatar/controller.php:81
+msgid "Unknown filetype"
+msgstr ""
+
+#: avatar/controller.php:85
+msgid "Invalid image"
+msgstr ""
+
+#: avatar/controller.php:115 avatar/controller.php:142
+msgid "No temporary profile picture available, try again"
+msgstr ""
+
+#: avatar/controller.php:135
+msgid "No crop data provided"
+msgstr ""
+
+#: js/config.php:36
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:37
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:38
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:39
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:40
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:41
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:42
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:47
+msgid "January"
+msgstr ""
+
+#: js/config.php:48
+msgid "February"
+msgstr ""
+
+#: js/config.php:49
+msgid "March"
+msgstr ""
+
+#: js/config.php:50
+msgid "April"
+msgstr ""
+
+#: js/config.php:51
+msgid "May"
+msgstr ""
+
+#: js/config.php:52
+msgid "June"
+msgstr ""
+
+#: js/config.php:53
+msgid "July"
+msgstr ""
+
+#: js/config.php:54
+msgid "August"
+msgstr ""
+
+#: js/config.php:55
+msgid "September"
+msgstr ""
+
+#: js/config.php:56
+msgid "October"
+msgstr ""
+
+#: js/config.php:57
+msgid "November"
+msgstr ""
+
+#: js/config.php:58
+msgid "December"
+msgstr ""
+
+#: js/js.js:458
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
+msgid "seconds ago"
+msgstr ""
+
+#: js/js.js:996
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+
+#: js/js.js:997
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+
+#: js/js.js:998
+msgid "today"
+msgstr ""
+
+#: js/js.js:999
+msgid "yesterday"
+msgstr ""
+
+#: js/js.js:1000
+msgid "%n day ago"
+msgid_plural "%n days ago"
+msgstr[0] ""
+
+#: js/js.js:1001
+msgid "last month"
+msgstr ""
+
+#: js/js.js:1002
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+
+#: js/js.js:1003
+msgid "months ago"
+msgstr ""
+
+#: js/js.js:1004
+msgid "last year"
+msgstr ""
+
+#: js/js.js:1005
+msgid "years ago"
+msgstr ""
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr ""
+
+#: js/oc-dialogs.js:146
+msgid "Error loading file picker template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:172
+msgid "Yes"
+msgstr ""
+
+#: js/oc-dialogs.js:182
+msgid "No"
+msgstr ""
+
+#: js/oc-dialogs.js:199
+msgid "Ok"
+msgstr ""
+
+#: js/oc-dialogs.js:219
+msgid "Error loading message template: {error}"
+msgstr ""
+
+#: js/oc-dialogs.js:347
+msgid "{count} file conflict"
+msgid_plural "{count} file conflicts"
+msgstr[0] ""
+
+#: js/oc-dialogs.js:361
+msgid "One file conflict"
+msgstr ""
+
+#: js/oc-dialogs.js:367
+msgid "Which files do you want to keep?"
+msgstr ""
+
+#: js/oc-dialogs.js:368
+msgid ""
+"If you select both versions, the copied file will have a number added to its"
+" name."
+msgstr ""
+
+#: js/oc-dialogs.js:376
+msgid "Cancel"
+msgstr ""
+
+#: js/oc-dialogs.js:386
+msgid "Continue"
+msgstr ""
+
+#: js/oc-dialogs.js:433 js/oc-dialogs.js:446
+msgid "(all selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:436 js/oc-dialogs.js:449
+msgid "({count} selected)"
+msgstr ""
+
+#: js/oc-dialogs.js:457
+msgid "Error loading file exists template"
+msgstr ""
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
+#: js/share.js:51 js/share.js:66 js/share.js:106
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:109
+msgid "Share"
+msgstr ""
+
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
+msgid "Error"
+msgstr ""
+
+#: js/share.js:160 js/share.js:767
+msgid "Error while sharing"
+msgstr ""
+
+#: js/share.js:171
+msgid "Error while unsharing"
+msgstr ""
+
+#: js/share.js:178
+msgid "Error while changing permissions"
+msgstr ""
+
+#: js/share.js:188
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:190
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:214
+msgid "Share with user or group …"
+msgstr ""
+
+#: js/share.js:220
+msgid "Share link"
+msgstr ""
+
+#: js/share.js:223
+msgid "Password protect"
+msgstr ""
+
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
+msgid "Password"
+msgstr ""
+
+#: js/share.js:230
+msgid "Allow Public Upload"
+msgstr ""
+
+#: js/share.js:234
+msgid "Email link to person"
+msgstr ""
+
+#: js/share.js:235
+msgid "Send"
+msgstr ""
+
+#: js/share.js:240
+msgid "Set expiration date"
+msgstr ""
+
+#: js/share.js:241
+msgid "Expiration date"
+msgstr ""
+
+#: js/share.js:277
+msgid "Share via email:"
+msgstr ""
+
+#: js/share.js:280
+msgid "No people found"
+msgstr ""
+
+#: js/share.js:324 js/share.js:363
+msgid "group"
+msgstr ""
+
+#: js/share.js:335
+msgid "Resharing is not allowed"
+msgstr ""
+
+#: js/share.js:379
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:401
+msgid "Unshare"
+msgstr ""
+
+#: js/share.js:409
+msgid "notify by email"
+msgstr ""
+
+#: js/share.js:412
+msgid "can edit"
+msgstr ""
+
+#: js/share.js:414
+msgid "access control"
+msgstr ""
+
+#: js/share.js:417
+msgid "create"
+msgstr ""
+
+#: js/share.js:420
+msgid "update"
+msgstr ""
+
+#: js/share.js:423
+msgid "delete"
+msgstr ""
+
+#: js/share.js:426
+msgid "share"
+msgstr ""
+
+#: js/share.js:698
+msgid "Password protected"
+msgstr ""
+
+#: js/share.js:711
+msgid "Error unsetting expiration date"
+msgstr ""
+
+#: js/share.js:729
+msgid "Error setting expiration date"
+msgstr ""
+
+#: js/share.js:754
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:765
+msgid "Email sent"
+msgstr ""
+
+#: js/share.js:789
+msgid "Warning"
+msgstr ""
+
+#: js/tags.js:4
+msgid "The object type is not specified."
+msgstr ""
+
+#: js/tags.js:13
+msgid "Enter new"
+msgstr ""
+
+#: js/tags.js:27
+msgid "Delete"
+msgstr ""
+
+#: js/tags.js:31
+msgid "Add"
+msgstr ""
+
+#: js/tags.js:39
+msgid "Edit tags"
+msgstr ""
+
+#: js/tags.js:57
+msgid "Error loading dialog template: {error}"
+msgstr ""
+
+#: js/tags.js:261
+msgid "No tags selected for deletion."
+msgstr ""
+
+#: js/update.js:8
+msgid "Please reload the page."
+msgstr ""
+
+#: js/update.js:17
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:21
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
+#: lostpassword/controller.php:70
+#, php-format
+msgid "%s password reset"
+msgstr ""
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:7
+msgid ""
+"The link to reset your password has been sent to your email.<br>If you do "
+"not receive it within a reasonable amount of time, check your spam/junk "
+"folders.<br>If it is not there ask your local administrator ."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:15
+msgid "Request failed!<br>Did you make sure your email/username was right?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:18
+msgid "You will receive a link to reset your password via Email."
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
+msgid "Username"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:25
+msgid ""
+"Your files are encrypted. If you haven't enabled the recovery key, there "
+"will be no way to get your data back after your password is reset. If you "
+"are not sure what to do, please contact your administrator before you "
+"continue. Do you really want to continue?"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:27
+msgid "Yes, I really want to reset my password now"
+msgstr ""
+
+#: lostpassword/templates/lostpassword.php:30
+msgid "Reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr ""
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr ""
+
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
+#: strings.php:5
+msgid "Personal"
+msgstr ""
+
+#: strings.php:6
+msgid "Users"
+msgstr ""
+
+#: strings.php:7 templates/layout.user.php:116
+msgid "Apps"
+msgstr ""
+
+#: strings.php:8
+msgid "Admin"
+msgstr ""
+
+#: strings.php:9
+msgid "Help"
+msgstr ""
+
+#: tags/controller.php:22
+msgid "Error loading tags"
+msgstr ""
+
+#: tags/controller.php:48
+msgid "Tag already exists"
+msgstr ""
+
+#: tags/controller.php:64
+msgid "Error deleting tag(s)"
+msgstr ""
+
+#: tags/controller.php:75
+msgid "Error tagging"
+msgstr ""
+
+#: tags/controller.php:86
+msgid "Error untagging"
+msgstr ""
+
+#: tags/controller.php:97
+msgid "Error favoriting"
+msgstr ""
+
+#: tags/controller.php:108
+msgid "Error unfavoriting"
+msgstr ""
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr ""
+
+#: templates/404.php:15
+msgid "Cloud not found"
+msgstr ""
+
+#: templates/altmail.php:2
+#, php-format
+msgid ""
+"Hey there,\n"
+"\n"
+"just letting you know that %s shared %s with you.\n"
+"View it: %s\n"
+"\n"
+msgstr ""
+
+#: templates/altmail.php:4 templates/mail.php:17
+#, php-format
+msgid "The share will expire on %s."
+msgstr ""
+
+#: templates/altmail.php:7 templates/mail.php:20
+msgid "Cheers!"
+msgstr ""
+
+#: templates/installation.php:25 templates/installation.php:32
+#: templates/installation.php:39
+msgid "Security Warning"
+msgstr ""
+
+#: templates/installation.php:26
+msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
+msgstr ""
+
+#: templates/installation.php:27
+#, php-format
+msgid "Please update your PHP installation to use %s securely."
+msgstr ""
+
+#: templates/installation.php:33
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr ""
+
+#: templates/installation.php:34
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr ""
+
+#: templates/installation.php:40
+msgid ""
+"Your data directory and files are probably accessible from the internet "
+"because the .htaccess file does not work."
+msgstr ""
+
+#: templates/installation.php:42
+#, php-format
+msgid ""
+"For information how to properly configure your server, please see the <a "
+"href=\"%s\" target=\"_blank\">documentation</a>."
+msgstr ""
+
+#: templates/installation.php:48
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
+
+#: templates/installation.php:77
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:90
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:94
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:118
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:123
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:132
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:140
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finish setup"
+msgstr ""
+
+#: templates/installation.php:150
+msgid "Finishing …"
+msgstr ""
+
+#: templates/layout.user.php:40
+msgid ""
+"This application requires JavaScript to be enabled for correct operation.  "
+"Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
+"JavaScript</a> and re-load this interface."
+msgstr ""
+
+#: templates/layout.user.php:44
+#, php-format
+msgid "%s is available. Get more information on how to update."
+msgstr ""
+
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
+msgid "Log out"
+msgstr ""
+
+#: templates/login.php:9
+msgid "Automatic logon rejected!"
+msgstr ""
+
+#: templates/login.php:10
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:12
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:17
+msgid "Server side authentication failed!"
+msgstr ""
+
+#: templates/login.php:18
+msgid "Please contact your administrator."
+msgstr ""
+
+#: templates/login.php:46
+msgid "Lost your password?"
+msgstr ""
+
+#: templates/login.php:51
+msgid "remember"
+msgstr ""
+
+#: templates/login.php:54
+msgid "Log in"
+msgstr ""
+
+#: templates/login.php:60
+msgid "Alternative Logins"
+msgstr ""
+
+#: templates/mail.php:15
+#, php-format
+msgid ""
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
+
+#: templates/singleuser.user.php:3
+msgid "This ownCloud instance is currently in single user mode."
+msgstr ""
+
+#: templates/singleuser.user.php:4
+msgid "This means only administrators can use the instance."
+msgstr ""
+
+#: templates/singleuser.user.php:5 templates/update.user.php:5
+msgid ""
+"Contact your system administrator if this message persists or appeared "
+"unexpectedly."
+msgstr ""
+
+#: templates/singleuser.user.php:7 templates/update.user.php:6
+msgid "Thank you for your patience."
+msgstr ""
+
+#: templates/update.admin.php:3
+#, php-format
+msgid "Updating ownCloud to version %s, this may take a while."
+msgstr ""
+
+#: templates/update.user.php:3
+msgid ""
+"This ownCloud instance is currently being updated, which may take a while."
+msgstr ""
+
+#: templates/update.user.php:4
+msgid "Please reload this page after a short time to continue using ownCloud."
+msgstr ""
diff --git a/l10n/su/files.po b/l10n/su/files.po
new file mode 100644
index 0000000000..cb2cdbaca3
--- /dev/null
+++ b/l10n/su/files.po
@@ -0,0 +1,413 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/move.php:17
+#, php-format
+msgid "Could not move %s - File with this name already exists"
+msgstr ""
+
+#: ajax/move.php:27 ajax/move.php:30
+#, php-format
+msgid "Could not move %s"
+msgstr ""
+
+#: ajax/newfile.php:57 js/files.js:98
+msgid "File name cannot be empty."
+msgstr ""
+
+#: ajax/newfile.php:62
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
+
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr ""
+
+#: ajax/newfile.php:96
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:101
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:118
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:155
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:21
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:65
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:67
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:74
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:75
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:77
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:78
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:79
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:80
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:81
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:99
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:156
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:383
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:475
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:562
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:566
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:568 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:634
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:650
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:700
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
+
+#: js/files.js:121
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:134
+msgid ""
+"Encryption App is enabled but your keys are not initialized, please log-out "
+"and log-in again"
+msgstr ""
+
+#: js/files.js:138
+msgid ""
+"Invalid private key for Encryption App. Please update your private key "
+"password in your personal settings to recover access to your encrypted "
+"files."
+msgstr ""
+
+#: js/files.js:142
+msgid ""
+"Encryption was disabled but your files are still encrypted. Please go to "
+"your personal settings to decrypt your files."
+msgstr ""
+
+#: js/files.js:379
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:610 js/files.js:654
+msgid "Error moving file"
+msgstr ""
+
+#: js/files.js:610 js/files.js:654
+msgid "Error"
+msgstr ""
+
+#: js/files.js:672 templates/index.php:68
+msgid "Name"
+msgstr ""
+
+#: js/files.js:673 templates/index.php:80
+msgid "Size"
+msgstr ""
+
+#: js/files.js:674 templates/index.php:82
+msgid "Modified"
+msgstr ""
+
+#: lib/app.php:60
+msgid "Invalid folder name. Usage of 'Shared' is reserved."
+msgstr ""
+
+#: lib/app.php:111
+#, php-format
+msgid "%s could not be renamed"
+msgstr ""
+
+#: lib/helper.php:14 templates/index.php:23
+msgid "Upload"
+msgstr ""
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr ""
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "max. possible: "
+msgstr ""
+
+#: templates/admin.php:15
+msgid "Needed for multi-file and folder downloads."
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Enable ZIP-download"
+msgstr ""
+
+#: templates/admin.php:20
+msgid "0 is unlimited"
+msgstr ""
+
+#: templates/admin.php:22
+msgid "Maximum input size for ZIP files"
+msgstr ""
+
+#: templates/admin.php:26
+msgid "Save"
+msgstr ""
+
+#: templates/index.php:6
+msgid "New"
+msgstr ""
+
+#: templates/index.php:9
+msgid "New text file"
+msgstr ""
+
+#: templates/index.php:10
+msgid "Text file"
+msgstr ""
+
+#: templates/index.php:13
+msgid "New folder"
+msgstr ""
+
+#: templates/index.php:14
+msgid "Folder"
+msgstr ""
+
+#: templates/index.php:17
+msgid "From link"
+msgstr ""
+
+#: templates/index.php:41
+msgid "Deleted files"
+msgstr ""
+
+#: templates/index.php:46
+msgid "Cancel upload"
+msgstr ""
+
+#: templates/index.php:52
+msgid "You don’t have permission to upload or create files here"
+msgstr ""
+
+#: templates/index.php:57
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:74
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:85 templates/index.php:86
+msgid "Delete"
+msgstr ""
+
+#: templates/index.php:98
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:100
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:105
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:108
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/su/files_encryption.po b/l10n/su/files_encryption.po
new file mode 100644
index 0000000000..43e3808a37
--- /dev/null
+++ b/l10n/su/files_encryption.po
@@ -0,0 +1,201 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/adminrecovery.php:29
+msgid "Recovery key successfully enabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:34
+msgid ""
+"Could not enable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/adminrecovery.php:48
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/adminrecovery.php:53
+msgid ""
+"Could not disable recovery key. Please check your recovery key password!"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:49
+msgid "Password successfully changed."
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:51
+msgid "Could not change the password. Maybe the old password was not correct."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:52
+msgid "Private key password successfully updated."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:54
+msgid ""
+"Could not update the private key password. Maybe the old password was not "
+"correct."
+msgstr ""
+
+#: files/error.php:12
+msgid ""
+"Encryption app not initialized! Maybe the encryption app was re-enabled "
+"during your session. Please try to log out and log back in to initialize the"
+" encryption app."
+msgstr ""
+
+#: files/error.php:16
+#, php-format
+msgid ""
+"Your private key is not valid! Likely your password was changed outside of "
+"%s (e.g. your corporate directory). You can update your private key password"
+" in your personal settings to recover access to your encrypted files."
+msgstr ""
+
+#: files/error.php:19
+msgid ""
+"Can not decrypt this file, probably this is a shared file. Please ask the "
+"file owner to reshare the file with you."
+msgstr ""
+
+#: files/error.php:22 files/error.php:27
+msgid ""
+"Unknown error please check your system settings or contact your "
+"administrator"
+msgstr ""
+
+#: hooks/hooks.php:64
+msgid "Missing requirements."
+msgstr ""
+
+#: hooks/hooks.php:65
+msgid ""
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
+"together with the PHP extension is enabled and configured properly. For now,"
+" the encryption app has been disabled."
+msgstr ""
+
+#: hooks/hooks.php:295
+msgid "Following users are not set up for encryption:"
+msgstr ""
+
+#: js/detect-migration.js:21
+msgid "Initial encryption started... This can take some time. Please wait."
+msgstr ""
+
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "Go directly to your "
+msgstr ""
+
+#: templates/invalid_private_key.php:8
+msgid "personal settings"
+msgstr ""
+
+#: templates/settings-admin.php:4 templates/settings-personal.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings-admin.php:7
+msgid ""
+"Enable recovery key (allow to recover users files in case of password loss):"
+msgstr ""
+
+#: templates/settings-admin.php:11
+msgid "Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:14
+msgid "Repeat Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:21 templates/settings-personal.php:51
+msgid "Enabled"
+msgstr ""
+
+#: templates/settings-admin.php:29 templates/settings-personal.php:59
+msgid "Disabled"
+msgstr ""
+
+#: templates/settings-admin.php:34
+msgid "Change recovery key password:"
+msgstr ""
+
+#: templates/settings-admin.php:40
+msgid "Old Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:47
+msgid "New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:53
+msgid "Repeat New Recovery key password"
+msgstr ""
+
+#: templates/settings-admin.php:58
+msgid "Change Password"
+msgstr ""
+
+#: templates/settings-personal.php:9
+msgid "Your private key password no longer match your log-in password:"
+msgstr ""
+
+#: templates/settings-personal.php:12
+msgid "Set your old private key password to your current log-in password."
+msgstr ""
+
+#: templates/settings-personal.php:14
+msgid ""
+" If you don't remember your old password you can ask your administrator to "
+"recover your files."
+msgstr ""
+
+#: templates/settings-personal.php:22
+msgid "Old log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:28
+msgid "Current log-in password"
+msgstr ""
+
+#: templates/settings-personal.php:33
+msgid "Update Private Key Password"
+msgstr ""
+
+#: templates/settings-personal.php:42
+msgid "Enable password recovery:"
+msgstr ""
+
+#: templates/settings-personal.php:44
+msgid ""
+"Enabling this option will allow you to reobtain access to your encrypted "
+"files in case of password loss"
+msgstr ""
+
+#: templates/settings-personal.php:60
+msgid "File recovery settings updated"
+msgstr ""
+
+#: templates/settings-personal.php:61
+msgid "Could not update file recovery"
+msgstr ""
diff --git a/l10n/su/files_external.po b/l10n/su/files_external.po
new file mode 100644
index 0000000000..ad5375c9f4
--- /dev/null
+++ b/l10n/su/files_external.po
@@ -0,0 +1,127 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:68 js/google.js:89
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:102
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:45 js/google.js:122
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:516
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
+#: lib/config.php:519
+msgid ""
+"<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
+"Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
+"your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:9 templates/settings.php:28
+msgid "Folder name"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "External storage"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:12
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Add storage"
+msgstr ""
+
+#: templates/settings.php:90
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:91
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:92
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:100
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:113 templates/settings.php:114
+#: templates/settings.php:155 templates/settings.php:156
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:127
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:130
+msgid "Allow users to mount the following external storage"
+msgstr ""
+
+#: templates/settings.php:147
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:165
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/su/files_sharing.po b/l10n/su/files_sharing.po
new file mode 100644
index 0000000000..868f619bef
--- /dev/null
+++ b/l10n/su/files_sharing.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
+#: templates/authenticate.php:4
+msgid "This share is password-protected"
+msgstr ""
+
+#: templates/authenticate.php:7
+msgid "The password is wrong. Try again."
+msgstr ""
+
+#: templates/authenticate.php:10
+msgid "Password"
+msgstr ""
+
+#: templates/part.404.php:3
+msgid "Sorry, this link doesn’t seem to work anymore."
+msgstr ""
+
+#: templates/part.404.php:4
+msgid "Reasons might be:"
+msgstr ""
+
+#: templates/part.404.php:6
+msgid "the item was removed"
+msgstr ""
+
+#: templates/part.404.php:7
+msgid "the link expired"
+msgstr ""
+
+#: templates/part.404.php:8
+msgid "sharing is disabled"
+msgstr ""
+
+#: templates/part.404.php:10
+msgid "For more info, please ask the person who sent this link."
+msgstr ""
+
+#: templates/public.php:17
+#, php-format
+msgid "shared by %s"
+msgstr ""
+
+#: templates/public.php:44
+#, php-format
+msgid "Download %s"
+msgstr ""
+
+#: templates/public.php:48
+msgid "Direct link"
+msgstr ""
diff --git a/l10n/su/files_trashbin.po b/l10n/su/files_trashbin.po
new file mode 100644
index 0000000000..a2c4e0bb72
--- /dev/null
+++ b/l10n/su/files_trashbin.po
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/delete.php:59
+#, php-format
+msgid "Couldn't delete %s permanently"
+msgstr ""
+
+#: ajax/undelete.php:64
+#, php-format
+msgid "Couldn't restore %s"
+msgstr ""
+
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
+msgid "Error"
+msgstr ""
+
+#: lib/trashbin.php:852 lib/trashbin.php:854
+msgid "restored"
+msgstr ""
+
+#: templates/index.php:7
+msgid "Nothing in here. Your trash bin is empty!"
+msgstr ""
+
+#: templates/index.php:20
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:23 templates/index.php:25
+msgid "Restore"
+msgstr ""
+
+#: templates/index.php:31
+msgid "Deleted"
+msgstr ""
+
+#: templates/index.php:34 templates/index.php:35
+msgid "Delete"
+msgstr ""
+
+#: templates/part.breadcrumb.php:8
+msgid "Deleted Files"
+msgstr ""
diff --git a/l10n/su/files_versions.po b/l10n/su/files_versions.po
new file mode 100644
index 0000000000..7b3c1daa71
--- /dev/null
+++ b/l10n/su/files_versions.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-02-08 16:07+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/rollbackVersion.php:13
+#, php-format
+msgid "Could not revert: %s"
+msgstr ""
+
+#: js/versions.js:14
+msgid "Versions"
+msgstr ""
+
+#: js/versions.js:60
+msgid "Failed to revert {file} to revision {timestamp}."
+msgstr ""
+
+#: js/versions.js:87
+msgid "More versions..."
+msgstr ""
+
+#: js/versions.js:125
+msgid "No other versions available"
+msgstr ""
+
+#: js/versions.js:155
+msgid "Restore"
+msgstr ""
diff --git a/l10n/su/lib.po b/l10n/su/lib.po
new file mode 100644
index 0000000000..15649f4f65
--- /dev/null
+++ b/l10n/su/lib.po
@@ -0,0 +1,334 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: private/app.php:236
+#, php-format
+msgid ""
+"App \"%s\" can't be installed because it is not compatible with this version"
+" of ownCloud."
+msgstr ""
+
+#: private/app.php:248
+msgid "No app name specified"
+msgstr ""
+
+#: private/app.php:353
+msgid "Help"
+msgstr ""
+
+#: private/app.php:366
+msgid "Personal"
+msgstr ""
+
+#: private/app.php:377
+msgid "Settings"
+msgstr ""
+
+#: private/app.php:389
+msgid "Users"
+msgstr ""
+
+#: private/app.php:402
+msgid "Admin"
+msgstr ""
+
+#: private/app.php:875
+#, php-format
+msgid "Failed to upgrade \"%s\"."
+msgstr ""
+
+#: private/avatar.php:66
+msgid "Unknown filetype"
+msgstr ""
+
+#: private/avatar.php:71
+msgid "Invalid image"
+msgstr ""
+
+#: private/defaults.php:35
+msgid "web services under your control"
+msgstr ""
+
+#: private/files.php:231
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: private/files.php:232
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: private/files.php:233 private/files.php:261
+msgid "Back to Files"
+msgstr ""
+
+#: private/files.php:258
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: private/files.php:259
+msgid ""
+"Please download the files separately in smaller chunks or kindly ask your "
+"administrator."
+msgstr ""
+
+#: private/installer.php:64
+msgid "No source specified when installing app"
+msgstr ""
+
+#: private/installer.php:71
+msgid "No href specified when installing app from http"
+msgstr ""
+
+#: private/installer.php:76
+msgid "No path specified when installing app from local file"
+msgstr ""
+
+#: private/installer.php:90
+#, php-format
+msgid "Archives of type %s are not supported"
+msgstr ""
+
+#: private/installer.php:104
+msgid "Failed to open archive when installing app"
+msgstr ""
+
+#: private/installer.php:126
+msgid "App does not provide an info.xml file"
+msgstr ""
+
+#: private/installer.php:132
+msgid "App can't be installed because of not allowed code in the App"
+msgstr ""
+
+#: private/installer.php:141
+msgid ""
+"App can't be installed because it is not compatible with this version of "
+"ownCloud"
+msgstr ""
+
+#: private/installer.php:147
+msgid ""
+"App can't be installed because it contains the <shipped>true</shipped> tag "
+"which is not allowed for non shipped apps"
+msgstr ""
+
+#: private/installer.php:160
+msgid ""
+"App can't be installed because the version in info.xml/version is not the "
+"same as the version reported from the app store"
+msgstr ""
+
+#: private/installer.php:170
+msgid "App directory already exists"
+msgstr ""
+
+#: private/installer.php:183
+#, php-format
+msgid "Can't create app folder. Please fix permissions. %s"
+msgstr ""
+
+#: private/json.php:29
+msgid "Application is not enabled"
+msgstr ""
+
+#: private/json.php:40 private/json.php:63 private/json.php:88
+msgid "Authentication error"
+msgstr ""
+
+#: private/json.php:52
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
+#: private/search/provider/file.php:18 private/search/provider/file.php:36
+msgid "Files"
+msgstr ""
+
+#: private/search/provider/file.php:27 private/search/provider/file.php:34
+msgid "Text"
+msgstr ""
+
+#: private/search/provider/file.php:30
+msgid "Images"
+msgstr ""
+
+#: private/setup/abstractdatabase.php:26
+#, php-format
+msgid "%s enter the database username."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:29
+#, php-format
+msgid "%s enter the database name."
+msgstr ""
+
+#: private/setup/abstractdatabase.php:32
+#, php-format
+msgid "%s you may not use dots in the database name"
+msgstr ""
+
+#: private/setup/mssql.php:20
+#, php-format
+msgid "MS SQL username and/or password not valid: %s"
+msgstr ""
+
+#: 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
+msgid "You need to enter either an existing account or the administrator."
+msgstr ""
+
+#: private/setup/mysql.php:12
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
+
+#: 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
+#, php-format
+msgid "DB Error: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:68 private/setup/oci.php:55
+#: 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
+#, php-format
+msgid "Offending command was: \"%s\""
+msgstr ""
+
+#: private/setup/mysql.php:85
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
+
+#: private/setup/mysql.php:86
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
+
+#: private/setup/mysql.php:91
+#, php-format
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
+
+#: private/setup/mysql.php:92
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
+
+#: private/setup/oci.php:34
+msgid "Oracle connection could not be established"
+msgstr ""
+
+#: private/setup/oci.php:41 private/setup/oci.php:113
+msgid "Oracle username and/or password not valid"
+msgstr ""
+
+#: private/setup/oci.php:170 private/setup/oci.php:202
+#, php-format
+msgid "Offending command was: \"%s\", name: %s, password: %s"
+msgstr ""
+
+#: private/setup/postgresql.php:23 private/setup/postgresql.php:69
+msgid "PostgreSQL username and/or password not valid"
+msgstr ""
+
+#: private/setup.php:28
+msgid "Set an admin username."
+msgstr ""
+
+#: private/setup.php:31
+msgid "Set an admin password."
+msgstr ""
+
+#: private/setup.php:198
+msgid ""
+"Your web server is not yet properly setup to allow files synchronization "
+"because the WebDAV interface seems to be broken."
+msgstr ""
+
+#: private/setup.php:199
+#, php-format
+msgid "Please double check the <a href='%s'>installation guides</a>."
+msgstr ""
+
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
+#, php-format
+msgid "Could not find category \"%s\""
+msgstr ""
+
+#: private/template/functions.php:133
+msgid "seconds ago"
+msgstr ""
+
+#: private/template/functions.php:134
+msgid "%n minute ago"
+msgid_plural "%n minutes ago"
+msgstr[0] ""
+
+#: private/template/functions.php:135
+msgid "%n hour ago"
+msgid_plural "%n hours ago"
+msgstr[0] ""
+
+#: private/template/functions.php:136
+msgid "today"
+msgstr ""
+
+#: private/template/functions.php:137
+msgid "yesterday"
+msgstr ""
+
+#: private/template/functions.php:139
+msgid "%n day go"
+msgid_plural "%n days ago"
+msgstr[0] ""
+
+#: private/template/functions.php:141
+msgid "last month"
+msgstr ""
+
+#: private/template/functions.php:142
+msgid "%n month ago"
+msgid_plural "%n months ago"
+msgstr[0] ""
+
+#: private/template/functions.php:144
+msgid "last year"
+msgstr ""
+
+#: private/template/functions.php:145
+msgid "years ago"
+msgstr ""
diff --git a/l10n/su/settings.po b/l10n/su/settings.po
new file mode 100644
index 0000000000..f93147a8bc
--- /dev/null
+++ b/l10n/su/settings.po
@@ -0,0 +1,824 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
+#: ajax/apps/ocs.php:20
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
+#: ajax/togglegroups.php:20 changepassword/controller.php:55
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/changedisplayname.php:31
+msgid "Your full name has been changed."
+msgstr ""
+
+#: ajax/changedisplayname.php:34
+msgid "Unable to change full name"
+msgstr ""
+
+#: ajax/creategroup.php:10
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Unable to add group"
+msgstr ""
+
+#: ajax/lostpassword.php:12
+msgid "Email saved"
+msgstr ""
+
+#: ajax/lostpassword.php:14
+msgid "Invalid email"
+msgstr ""
+
+#: ajax/removegroup.php:13
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:25
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:15
+msgid "Language changed"
+msgstr ""
+
+#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
+msgid "Invalid request"
+msgstr ""
+
+#: ajax/togglegroups.php:12
+msgid "Admins can't remove themself from the admin group"
+msgstr ""
+
+#: ajax/togglegroups.php:30
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:36
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
+#: ajax/updateapp.php:14
+msgid "Couldn't update app."
+msgstr ""
+
+#: changepassword/controller.php:20
+msgid "Wrong password"
+msgstr ""
+
+#: changepassword/controller.php:42
+msgid "No user supplied"
+msgstr ""
+
+#: changepassword/controller.php:74
+msgid ""
+"Please provide an admin recovery password, otherwise all user data will be "
+"lost"
+msgstr ""
+
+#: changepassword/controller.php:79
+msgid ""
+"Wrong admin recovery password. Please check the password and try again."
+msgstr ""
+
+#: changepassword/controller.php:87
+msgid ""
+"Back-end doesn't support password change, but the users encryption key was "
+"successfully updated."
+msgstr ""
+
+#: changepassword/controller.php:92 changepassword/controller.php:103
+msgid "Unable to change password"
+msgstr ""
+
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
+msgid "Update to {appversion}"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
+msgid "Disable"
+msgstr ""
+
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
+msgid "Enable"
+msgstr ""
+
+#: js/apps.js:95
+msgid "Please wait...."
+msgstr ""
+
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
+msgid "Error while disabling app"
+msgstr ""
+
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
+msgid "Error while enabling app"
+msgstr ""
+
+#: js/apps.js:149
+msgid "Updating...."
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error while updating app"
+msgstr ""
+
+#: js/apps.js:152
+msgid "Error"
+msgstr ""
+
+#: js/apps.js:153 templates/apps.php:54
+msgid "Update"
+msgstr ""
+
+#: js/apps.js:156
+msgid "Updated"
+msgstr ""
+
+#: js/personal.js:246
+msgid "Select a profile picture"
+msgstr ""
+
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
+
+#: js/users.js:47
+msgid "deleted"
+msgstr ""
+
+#: js/users.js:47
+msgid "undo"
+msgstr ""
+
+#: js/users.js:79
+msgid "Unable to remove user"
+msgstr ""
+
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
+msgid "Groups"
+msgstr ""
+
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
+msgid "Group Admin"
+msgstr ""
+
+#: js/users.js:127 templates/users.php:168
+msgid "Delete"
+msgstr ""
+
+#: js/users.js:310
+msgid "add group"
+msgstr ""
+
+#: js/users.js:486
+msgid "A valid username must be provided"
+msgstr ""
+
+#: js/users.js:487 js/users.js:493 js/users.js:508
+msgid "Error creating user"
+msgstr ""
+
+#: js/users.js:492
+msgid "A valid password must be provided"
+msgstr ""
+
+#: js/users.js:516
+msgid "Warning: Home directory for user \"{user}\" already exists"
+msgstr ""
+
+#: personal.php:49 personal.php:50
+msgid "__language_name__"
+msgstr ""
+
+#: templates/admin.php:8
+msgid "Everything (fatal issues, errors, warnings, info, debug)"
+msgstr ""
+
+#: templates/admin.php:9
+msgid "Info, warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:10
+msgid "Warnings, errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:11
+msgid "Errors and fatal issues"
+msgstr ""
+
+#: templates/admin.php:12
+msgid "Fatal issues only"
+msgstr ""
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
+
+#: 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 "
+"configure your webserver in a way that the data directory is no longer "
+"accessible or you move the data directory outside the webserver document "
+"root."
+msgstr ""
+
+#: templates/admin.php:75
+msgid "Setup Warning"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:79
+#, php-format
+msgid "Please double check the <a href=\"%s\">installation guides</a>."
+msgstr ""
+
+#: templates/admin.php:90
+msgid "Module 'fileinfo' missing"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:104
+msgid "Your PHP version is outdated"
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:118
+msgid "Locale not working"
+msgstr ""
+
+#: templates/admin.php:123
+msgid "System locale can not be set to a one which supports UTF-8."
+msgstr ""
+
+#: templates/admin.php:127
+msgid ""
+"This means that there might be problems with certain characters in file "
+"names."
+msgstr ""
+
+#: 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 ""
+
+#: templates/admin.php:143
+msgid "Internet connection not working"
+msgstr ""
+
+#: 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 "
+"installation of 3rd party apps don´t work. Accessing files from remote and "
+"sending of notification emails might also not work. We suggest to enable "
+"internet connection for this server if you want to have all features."
+msgstr ""
+
+#: templates/admin.php:160
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
+msgid "Execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:192
+msgid ""
+"cron.php is registered at a webcron service to call cron.php every 15 "
+"minutes over http."
+msgstr ""
+
+#: templates/admin.php:200
+msgid "Use systems cron service to call the cron.php file every 15 minutes."
+msgstr ""
+
+#: templates/admin.php:205
+msgid "Sharing"
+msgstr ""
+
+#: templates/admin.php:211
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:212
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:219
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:220
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:227
+msgid "Allow public uploads"
+msgstr ""
+
+#: templates/admin.php:228
+msgid ""
+"Allow users to enable others to upload into their publicly shared folders"
+msgstr ""
+
+#: templates/admin.php:235
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:236
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:243
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:246
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:253
+msgid "Allow mail notification"
+msgstr ""
+
+#: templates/admin.php:254
+msgid "Allow user to send mail notification for shared files"
+msgstr ""
+
+#: templates/admin.php:261
+msgid "Security"
+msgstr ""
+
+#: templates/admin.php:274
+msgid "Enforce HTTPS"
+msgstr ""
+
+#: templates/admin.php:276
+#, php-format
+msgid "Forces the clients to connect to %s via an encrypted connection."
+msgstr ""
+
+#: templates/admin.php:282
+#, php-format
+msgid ""
+"Please connect to your %s via HTTPS to enable or disable the SSL "
+"enforcement."
+msgstr ""
+
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:377
+msgid "Log level"
+msgstr ""
+
+#: templates/admin.php:409
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:410
+msgid "Less"
+msgstr ""
+
+#: templates/admin.php:416 templates/personal.php:181
+msgid "Version"
+msgstr ""
+
+#: templates/admin.php:420 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\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:14
+msgid "Add your App"
+msgstr ""
+
+#: templates/apps.php:31
+msgid "More Apps"
+msgstr ""
+
+#: templates/apps.php:37
+msgid "Select an App"
+msgstr ""
+
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
+msgid "See application page at apps.owncloud.com"
+msgstr ""
+
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:6
+msgid "Administrator Documentation"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Online Documentation"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Forum"
+msgstr ""
+
+#: templates/help.php:14
+msgid "Bugtracker"
+msgstr ""
+
+#: templates/help.php:17
+msgid "Commercial Support"
+msgstr ""
+
+#: templates/personal.php:8
+msgid "Get the apps to sync your files"
+msgstr ""
+
+#: templates/personal.php:19
+msgid "Show First Run Wizard again"
+msgstr ""
+
+#: templates/personal.php:27
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
+msgstr ""
+
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
+msgid "Password"
+msgstr ""
+
+#: templates/personal.php:40
+msgid "Your password was changed"
+msgstr ""
+
+#: templates/personal.php:41
+msgid "Unable to change your password"
+msgstr ""
+
+#: templates/personal.php:43
+msgid "Current password"
+msgstr ""
+
+#: templates/personal.php:46
+msgid "New password"
+msgstr ""
+
+#: templates/personal.php:50
+msgid "Change password"
+msgstr ""
+
+#: templates/personal.php:64 templates/users.php:86
+msgid "Full Name"
+msgstr ""
+
+#: templates/personal.php:81
+msgid "Email"
+msgstr ""
+
+#: templates/personal.php:83
+msgid "Your email address"
+msgstr ""
+
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
+msgid "Profile picture"
+msgstr ""
+
+#: templates/personal.php:101
+msgid "Upload new"
+msgstr ""
+
+#: templates/personal.php:103
+msgid "Select new from Files"
+msgstr ""
+
+#: templates/personal.php:104
+msgid "Remove image"
+msgstr ""
+
+#: templates/personal.php:105
+msgid "Either png or jpg. Ideally square but you will be able to crop it."
+msgstr ""
+
+#: templates/personal.php:107
+msgid "Your avatar is provided by your original account."
+msgstr ""
+
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr ""
+
+#: templates/personal.php:112
+msgid "Choose as profile image"
+msgstr ""
+
+#: templates/personal.php:120 templates/personal.php:121
+msgid "Language"
+msgstr ""
+
+#: templates/personal.php:140
+msgid "Help translate"
+msgstr ""
+
+#: templates/personal.php:147
+msgid "WebDAV"
+msgstr ""
+
+#: templates/personal.php:149
+#, php-format
+msgid ""
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
+"WebDAV</a>"
+msgstr ""
+
+#: templates/personal.php:161
+msgid "The encryption app is no longer enabled, please decrypt all your files"
+msgstr ""
+
+#: templates/personal.php:167
+msgid "Log-in password"
+msgstr ""
+
+#: templates/personal.php:172
+msgid "Decrypt all Files"
+msgstr ""
+
+#: templates/users.php:19
+msgid "Login Name"
+msgstr ""
+
+#: templates/users.php:28
+msgid "Create"
+msgstr ""
+
+#: templates/users.php:34
+msgid "Admin Recovery Password"
+msgstr ""
+
+#: templates/users.php:35 templates/users.php:36
+msgid ""
+"Enter the recovery password in order to recover the users files during "
+"password change"
+msgstr ""
+
+#: templates/users.php:40
+msgid "Default Storage"
+msgstr ""
+
+#: templates/users.php:42 templates/users.php:137
+msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
+msgstr ""
+
+#: templates/users.php:46 templates/users.php:146
+msgid "Unlimited"
+msgstr ""
+
+#: templates/users.php:64 templates/users.php:161
+msgid "Other"
+msgstr ""
+
+#: templates/users.php:85
+msgid "Username"
+msgstr ""
+
+#: templates/users.php:92
+msgid "Storage"
+msgstr ""
+
+#: templates/users.php:106
+msgid "change full name"
+msgstr ""
+
+#: templates/users.php:110
+msgid "set new password"
+msgstr ""
+
+#: templates/users.php:141
+msgid "Default"
+msgstr ""
diff --git a/l10n/su/user_ldap.po b/l10n/su/user_ldap.po
new file mode 100644
index 0000000000..aa4721f182
--- /dev/null
+++ b/l10n/su/user_ldap.po
@@ -0,0 +1,521 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: 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"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/clearMappings.php:34
+msgid "Failed to clear the mappings."
+msgstr ""
+
+#: ajax/deleteConfiguration.php:34
+msgid "Failed to delete the server configuration"
+msgstr ""
+
+#: ajax/testConfiguration.php:39
+msgid "The configuration is valid and the connection could be established!"
+msgstr ""
+
+#: ajax/testConfiguration.php:42
+msgid ""
+"The configuration is valid, but the Bind failed. Please check the server "
+"settings and credentials."
+msgstr ""
+
+#: ajax/testConfiguration.php:46
+msgid ""
+"The configuration is invalid. Please have a look at the logs for further "
+"details."
+msgstr ""
+
+#: ajax/wizard.php:32
+msgid "No action specified"
+msgstr ""
+
+#: ajax/wizard.php:38
+msgid "No configuration specified"
+msgstr ""
+
+#: ajax/wizard.php:81
+msgid "No data specified"
+msgstr ""
+
+#: ajax/wizard.php:89
+#, php-format
+msgid " Could not set configuration %s"
+msgstr ""
+
+#: js/settings.js:67
+msgid "Deletion failed"
+msgstr ""
+
+#: js/settings.js:83
+msgid "Take over settings from recent server configuration?"
+msgstr ""
+
+#: js/settings.js:84
+msgid "Keep settings?"
+msgstr ""
+
+#: js/settings.js:99
+msgid "Cannot add server configuration"
+msgstr ""
+
+#: js/settings.js:127
+msgid "mappings cleared"
+msgstr ""
+
+#: js/settings.js:128
+msgid "Success"
+msgstr ""
+
+#: js/settings.js:133
+msgid "Error"
+msgstr ""
+
+#: js/settings.js:838
+msgid "Configuration OK"
+msgstr ""
+
+#: js/settings.js:847
+msgid "Configuration incorrect"
+msgstr ""
+
+#: js/settings.js:856
+msgid "Configuration incomplete"
+msgstr ""
+
+#: js/settings.js:873 js/settings.js:882
+msgid "Select groups"
+msgstr ""
+
+#: js/settings.js:876 js/settings.js:885
+msgid "Select object classes"
+msgstr ""
+
+#: js/settings.js:879
+msgid "Select attributes"
+msgstr ""
+
+#: js/settings.js:906
+msgid "Connection test succeeded"
+msgstr ""
+
+#: js/settings.js:913
+msgid "Connection test failed"
+msgstr ""
+
+#: js/settings.js:922
+msgid "Do you really want to delete the current Server Configuration?"
+msgstr ""
+
+#: js/settings.js:923
+msgid "Confirm Deletion"
+msgstr ""
+
+#: lib/wizard.php:79 lib/wizard.php:93
+#, php-format
+msgid "%s group found"
+msgid_plural "%s groups found"
+msgstr[0] ""
+
+#: lib/wizard.php:122
+#, php-format
+msgid "%s user found"
+msgid_plural "%s users found"
+msgstr[0] ""
+
+#: lib/wizard.php:784 lib/wizard.php:796
+msgid "Invalid Host"
+msgstr ""
+
+#: lib/wizard.php:963
+msgid "Could not find the desired feature"
+msgstr ""
+
+#: templates/part.settingcontrols.php:2
+msgid "Save"
+msgstr ""
+
+#: templates/part.settingcontrols.php:4
+msgid "Test Configuration"
+msgstr ""
+
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+msgid "Help"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:4
+#, php-format
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:8
+#: templates/part.wizard-userfilter.php:8
+msgid "only those object classes:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:17
+#: templates/part.wizard-userfilter.php:17
+msgid "only from those groups:"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:25
+#: templates/part.wizard-loginfilter.php:32
+#: templates/part.wizard-userfilter.php:25
+msgid "Edit raw filter instead"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:30
+#: templates/part.wizard-loginfilter.php:37
+#: templates/part.wizard-userfilter.php:30
+msgid "Raw LDAP filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP groups shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:38
+msgid "groups found"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:4
+msgid "Users login with this attribute:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:8
+msgid "LDAP Username:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:16
+msgid "LDAP Email Address:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:24
+msgid "Other Attributes:"
+msgstr ""
+
+#: templates/part.wizard-loginfilter.php:38
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action. Example: \"uid=%%uid\""
+msgstr ""
+
+#: templates/part.wizard-server.php:18
+msgid "Add Server Configuration"
+msgstr ""
+
+#: templates/part.wizard-server.php:30
+msgid "Host"
+msgstr ""
+
+#: templates/part.wizard-server.php:31
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/part.wizard-server.php:36
+msgid "Port"
+msgstr ""
+
+#: templates/part.wizard-server.php:44
+msgid "User DN"
+msgstr ""
+
+#: templates/part.wizard-server.php:45
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:52
+msgid "Password"
+msgstr ""
+
+#: templates/part.wizard-server.php:53
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/part.wizard-server.php:60
+msgid "One Base DN per line"
+msgstr ""
+
+#: templates/part.wizard-server.php:61
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:4
+#, php-format
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:31
+#, php-format
+msgid ""
+"The filter specifies which LDAP users shall have access to the %s instance."
+msgstr ""
+
+#: templates/part.wizard-userfilter.php:38
+msgid "users found"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:5
+msgid "Back"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:8
+msgid "Continue"
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behavior. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:14
+msgid ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Connection Settings"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Configuration Active"
+msgstr ""
+
+#: templates/settings.php:22
+msgid "When unchecked, this configuration will be skipped."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Backup (Replica) Host"
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"Give an optional backup host. It must be a replica of the main LDAP/AD "
+"server."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "Backup (Replica) Port"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Disable Main Server"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Only connect to the replica server."
+msgstr ""
+
+#: templates/settings.php:26
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:27
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:27
+#, php-format
+msgid ""
+"Not recommended, use it for testing only! If connection only works with this"
+" option, import the LDAP server's SSL certificate in your %s server."
+msgstr ""
+
+#: templates/settings.php:28
+msgid "Cache Time-To-Live"
+msgstr ""
+
+#: templates/settings.php:28
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid "Directory Settings"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:32
+msgid "The LDAP attribute to use to generate the user's display name."
+msgstr ""
+
+#: templates/settings.php:33
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:33
+msgid "One User Base DN per line"
+msgstr ""
+
+#: templates/settings.php:34
+msgid "User Search Attributes"
+msgstr ""
+
+#: templates/settings.php:34 templates/settings.php:37
+msgid "Optional; one attribute per line"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:35
+msgid "The LDAP attribute to use to generate the groups's display name."
+msgstr ""
+
+#: templates/settings.php:36
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:36
+msgid "One Group Base DN per line"
+msgstr ""
+
+#: templates/settings.php:37
+msgid "Group Search Attributes"
+msgstr ""
+
+#: templates/settings.php:38
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
+msgid "Special Attributes"
+msgstr ""
+
+#: templates/settings.php:43
+msgid "Quota Field"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "Quota Default"
+msgstr ""
+
+#: templates/settings.php:44
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:45
+msgid "Email Field"
+msgstr ""
+
+#: templates/settings.php:46
+msgid "User Home Folder Naming Rule"
+msgstr ""
+
+#: templates/settings.php:46
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:52
+msgid "Internal Username"
+msgstr ""
+
+#: templates/settings.php:53
+msgid ""
+"By default the internal username will be created from the UUID attribute. It"
+" makes sure that the username is unique and characters do not need to be "
+"converted. The internal username has the restriction that only these "
+"characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced "
+"with their ASCII correspondence or simply omitted. On collisions a number "
+"will be added/increased. The internal username is used to identify a user "
+"internally. It is also the default name for the user home folder. It is also"
+" a part of remote URLs, for instance for all *DAV services. With this "
+"setting, the default behavior can be overridden. To achieve a similar "
+"behavior as before ownCloud 5 enter the user display name attribute in the "
+"following field. Leave it empty for default behavior. Changes will have "
+"effect only on newly mapped (added) LDAP users."
+msgstr ""
+
+#: templates/settings.php:54
+msgid "Internal Username Attribute:"
+msgstr ""
+
+#: templates/settings.php:55
+msgid "Override UUID detection"
+msgstr ""
+
+#: templates/settings.php:56
+msgid ""
+"By default, the UUID attribute is automatically detected. The UUID attribute"
+" is used to doubtlessly identify LDAP users and groups. Also, the internal "
+"username will be created based on the UUID, if not specified otherwise "
+"above. You can override the setting and pass an attribute of your choice. "
+"You must make sure that the attribute of your choice can be fetched for both"
+" users and groups and it is unique. Leave it empty for default behavior. "
+"Changes will have effect only on newly mapped (added) LDAP users and groups."
+msgstr ""
+
+#: templates/settings.php:57
+msgid "UUID Attribute for Users:"
+msgstr ""
+
+#: templates/settings.php:58
+msgid "UUID Attribute for Groups:"
+msgstr ""
+
+#: templates/settings.php:59
+msgid "Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:60
+msgid ""
+"Usernames are used to store and assign (meta) data. In order to precisely "
+"identify and recognize users, each LDAP user will have a internal username. "
+"This requires a mapping from username to LDAP user. The created username is "
+"mapped to the UUID of the LDAP user. Additionally the DN is cached as well "
+"to reduce LDAP interaction, but it is not used for identification. If the DN"
+" changes, the changes will be found. The internal username is used all over."
+" Clearing the mappings will have leftovers everywhere. Clearing the mappings"
+" is not configuration sensitive, it affects all LDAP configurations! Never "
+"clear the mappings in a production environment, only in a testing or "
+"experimental stage."
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Clear Username-LDAP User Mapping"
+msgstr ""
+
+#: templates/settings.php:61
+msgid "Clear Groupname-LDAP Group Mapping"
+msgstr ""
diff --git a/l10n/su/user_webdavauth.po b/l10n/su/user_webdavauth.po
new file mode 100644
index 0000000000..1a336d817e
--- /dev/null
+++ b/l10n/su/user_webdavauth.po
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-02-08 16:08+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: su\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Address: "
+msgstr ""
+
+#: templates/settings.php:7
+msgid ""
+"The user credentials will be sent to this address. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 8d95db7552..09583d597e 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,12 +24,11 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s delade »%s« med dig"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Gick inte att skicka e-post till följande användare: %s"
@@ -46,19 +45,6 @@ msgstr "Deaktiverade underhållsläge"
 msgid "Updated database"
 msgstr "Uppdaterade databasen"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Uppdaterar filcache, det kan ta lång tid..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Uppdaterade filcache"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% klart ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Ingen bild eller fil har tillhandahållits"
@@ -79,135 +65,139 @@ msgstr "Ingen temporär profilbild finns tillgänglig, försök igen"
 msgid "No crop data provided"
 msgstr "Ingen beskärdata har angivits"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Söndag"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Måndag"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Fredag"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Lördag"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Januari"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Februari"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mars"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "April"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Maj"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Juni"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Juli"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Augusti"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "September"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Oktober"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "November"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "December"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Sparar..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut sedan"
 msgstr[1] "%n minuter sedan"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n timme sedan"
 msgstr[1] "%n timmar sedan"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag sedan"
 msgstr[1] "%n dagar sedan"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "förra månaden"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n månad sedan"
 msgstr[1] "%n månader sedan"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "månader sedan"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "förra året"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "år sedan"
 
@@ -275,6 +265,26 @@ msgstr "({count} valda)"
 msgid "Error loading file exists template"
 msgstr "Fel uppstod filmall existerar"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Delad"
@@ -283,12 +293,12 @@ msgstr "Delad"
 msgid "Share"
 msgstr "Dela"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Fel"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Fel vid delning"
 
@@ -300,123 +310,123 @@ msgstr "Fel när delning skulle avslutas"
 msgid "Error while changing permissions"
 msgstr "Fel vid ändring av rättigheter"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delad med dig och gruppen {group} av {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Delad med dig av {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Dela med användare eller grupp..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Dela länk"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Lösenordsskydda"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Lösenord"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Tillåt publik uppladdning"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "E-posta länk till person"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Skicka"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Sätt utgångsdatum"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Utgångsdatum"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Dela via e-post:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Hittar inga användare"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "Grupp"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Dela vidare är inte tillåtet"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Delad i {item} med {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "informera via e-post"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "kan redigera"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "åtkomstkontroll"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "skapa"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "uppdatera"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "radera"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "dela"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Lösenordsskyddad"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgångsdatum"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Fel vid sättning av utgångsdatum"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Skickar ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-post skickat"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Varning"
 
@@ -463,11 +473,17 @@ msgstr "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"http
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s återställ lösenord"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Använd följande länk för att återställa lösenordet: {link}"
@@ -487,8 +503,8 @@ msgstr "Begäran misslyckades!<br>Är du helt säker på att din e-postadress/an
 msgid "You will receive a link to reset your password via Email."
 msgstr "Du får en länk att återställa ditt lösenord via e-post."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Användarnamn"
 
@@ -524,6 +540,18 @@ msgstr "Nytt lösenord"
 msgid "Reset password"
 msgstr "Återställ lösenordet"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Personligt"
@@ -532,7 +560,7 @@ msgstr "Personligt"
 msgid "Users"
 msgstr "Användare"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Program"
 
@@ -642,49 +670,47 @@ msgstr "För information hur du korrekt konfigurerar din servern, se ownCloud <a
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skapa ett <strong>administratörskonto</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Avancerad"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Datamapp"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Konfigurera databasen"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "kommer att användas"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Databasanvändare"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Lösenord till databasen"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Databasnamn"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Databas tabellutrymme"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Databasserver"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Avslutar ..."
 
@@ -700,7 +726,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Logga ut"
 
@@ -726,28 +752,28 @@ msgstr "Servern misslyckades med autentisering!"
 msgid "Please contact your administrator."
 msgstr "Kontakta din administratör."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Glömt ditt lösenord?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "kom ihåg"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Logga in"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternativa inloggningar"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 19f5324e9c..337141babf 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,283 +25,290 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Kunde inte flytta %s - Det finns redan en fil med detta namn"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Kan inte flytta %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Filnamn kan inte vara tomt."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Filnamnet får ej innehålla \"/\". Välj ett annat namn."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "Namnet %s används  redan i katalogen %s. Välj ett annat namn."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Inte en giltig källa"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "Fel under nerladdning från %s till %s"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Fel under skapande utav filen"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Katalognamn kan ej vara tomt."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Katalog namnet får ej innehålla \"/\". Välj ett annat namn."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Fel under skapande utav en katalog"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Kan inte sätta mapp för uppladdning."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Ogiltig token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. Okänt fel"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Inga fel uppstod. Filen laddades upp utan problem."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var endast delvis uppladdad"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Ingen fil laddades upp"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "En temporär mapp saknas"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Misslyckades spara till disk"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Inte tillräckligt med lagringsutrymme tillgängligt"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Uppladdning misslyckades. Gick inte att hämta filinformation."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Uppladdning misslyckades. Gick inte att hämta filinformation."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Filer"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes."
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Inte tillräckligt med utrymme tillgängligt"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Gick inte att hämta resultat från server."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL kan ej vara tomt"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "I hemma katalogen 'Delat' är ett reserverat filnamn"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Kunde ej skapa fil"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Kunde ej skapa katalog"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Dela"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Radera permanent"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Kan ej byta filnamn"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "ersatt {new_name} med {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "ångra"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Kunde inte ta bort filen."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n mapp"
 msgstr[1] "%n mappar"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n fil"
 msgstr[1] "%n filer"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} och {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "Laddar upp %n fil"
 msgstr[1] "Laddar upp %n filer"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' är ett ogiltigt filnamn."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ditt lagringsutrymme är fullt, filer kan inte längre uppdateras eller synkroniseras!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ditt lagringsutrymme är nästan fullt ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Krypteringsprogrammet är aktiverat men dina nycklar är inte initierade. Vänligen logga ut och  in igen"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Ogiltig privat nyckel i krypteringsprogrammet. Vänligen uppdatera lösenordet till din privata nyckel under dina personliga inställningar för att återfå tillgång till dina krypterade filer."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Din nedladdning förbereds. Det kan ta tid om det är stora filer."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Fel uppstod vid flyttning av fil"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Fel"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Ändrad"
 
@@ -309,12 +316,12 @@ msgstr "Ändrad"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Ogiltigt mappnamn. Användande av 'Shared' är reserverat av ownCloud"
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s kunde inte namnändras"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Ladda upp"
 
@@ -350,72 +357,68 @@ msgstr "Största tillåtna storlek för ZIP-filer"
 msgid "Save"
 msgstr "Spara"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Ny"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Textfil"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Mapp"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Från länk"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Raderade filer"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Du har ej tillåtelse att ladda upp eller skapa filer här"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting här. Ladda upp något!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "För stor uppladdning"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vänta"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Aktuell skanning"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Uppgraderar filsystemets cache..."
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index 170e14d7fe..ef12db2aaf 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,18 +87,18 @@ msgid ""
 "administrator"
 msgstr "Oväntat fel, kolla dina system inställningar eller kontakta din administratör"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Krav som saknas"
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad."
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Följande användare har inte aktiverat kryptering:"
 
@@ -106,9 +106,9 @@ msgstr "Följande användare har inte aktiverat kryptering:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Sparar..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index db436300c6..469fd35ede 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: medialabs\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Åtkomst beviljad"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Fel vid konfigurering av Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Bevilja åtkomst"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Ange en giltig Dropbox nyckel och hemlighet."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Fel vid konfigurering av Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Varning:</b> \"smb-klienten\" är inte installerad. Montering av CIFS/SMB delningar är inte möjligt. Kontakta din systemadministratör för att få den installerad."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Varning:</b> Stöd för FTP i PHP är inte aktiverat eller installerat. Montering av FTP-delningar är inte möjligt. Kontakta din systemadministratör för att få det installerat."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Användare"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Aktivera extern lagring för användare"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Tillåt användare att montera egen extern lagring"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL rotcertifikat"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Importera rotcertifikat"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 1f268c83f9..d23ab4a6d3 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/files_sharing.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: Gustav Smedberg <shadow.elf@hotmail.com>\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,10 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Delad av {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Den här delningen är lösenordsskyddad"
@@ -56,32 +60,16 @@ msgstr "delning är inaktiverat"
 msgid "For more info, please ask the person who sent this link."
 msgstr "För mer information, kontakta den person som skickade den här länken."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s delade mappen %s med dig"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s delade filen %s med dig"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Ladda ner"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Ladda upp"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Avbryt uppladdning"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Ingen förhandsgranskning tillgänglig för"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Direkt länk"
diff --git a/l10n/sv/files_trashbin.po b/l10n/sv/files_trashbin.po
index b0e25cc1df..8b48f32bd8 100644
--- a/l10n/sv/files_trashbin.po
+++ b/l10n/sv/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +19,48 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Kunde inte radera %s permanent"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Kunde inte återställa %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Raderade filer"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Fel"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "återställd"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Ingenting här. Din papperskorg är tom!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Namn"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Återskapa"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Raderad"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Raderade filer"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 54927d685c..34bfef2ce3 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,38 +22,38 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "Appen \"%s\" kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud."
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Inget appnamn angivet"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Hjälp"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Personligt"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Inställningar"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Användare"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Admin"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "Misslyckades med att uppgradera \"%s\"."
@@ -66,15 +66,10 @@ msgstr "Okänd filtyp"
 msgid "Invalid image"
 msgstr "Ogiltig bild"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "webbtjänster under din kontroll"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "Kan inte öppna \"%s\""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Nerladdning av ZIP är avstängd."
@@ -97,74 +92,78 @@ msgid ""
 "administrator."
 msgstr "Ladda ner filerna i mindre bitar, separat eller fråga din administratör."
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Ingen källa angiven vid installation av app "
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Ingen href angiven vid installation av app från http"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Ingen sökväg angiven vid installation av app från lokal fil"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "Arkiv av typen %s stöds ej"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Kunde inte öppna arkivet när appen skulle installeras"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Appen har ingen info.xml fil"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Appen kan inte installeras eftersom att den innehåller otillåten kod"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Appens mapp finns redan"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Applikationen är inte aktiverad"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Fel vid autentisering"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Ogiltig token. Ladda om sidan."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Filer"
@@ -204,8 +203,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Du måste antingen ange ett befintligt konto eller administratör."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL-användarnamnet och/eller lösenordet är felaktigt"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -232,21 +231,21 @@ msgstr "Det felaktiga kommandot var: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL-användaren '%s'@'localhost' existerar redan."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Radera denna användare från MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQl-användare '%s'@'%%' existerar redan"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Radera denna användare från MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -273,66 +272,72 @@ msgstr "Ange ett användarnamn för administratören."
 msgid "Set an admin password."
 msgstr "Ange ett administratörslösenord."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Var god kontrollera <a href='%s'>installationsguiden</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s delade »%s« med dig"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Kunde inte hitta kategorin \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n minut sedan"
 msgstr[1] "%n minuter sedan"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n timme sedan"
 msgstr[1] "%n timmar sedan"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "i dag"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "i går"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n dag sedan"
 msgstr[1] "%n dagar sedan"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "förra månaden"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n månad sedan"
 msgstr[1] "%n månader sedan"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "förra året"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "år sedan"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index eb3d26c3c0..260b11a449 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -16,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,6 +26,48 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-post skickat"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Kryptering"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Kan inte ladda listan från App Store"
@@ -122,62 +164,90 @@ msgstr "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteri
 msgid "Unable to change password"
 msgstr "Kunde inte ändra lösenord"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Användardokumentation"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Uppdatera till {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Deaktivera"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Aktivera"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Var god vänta..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Fel vid inaktivering av app"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Fel vid aktivering av app"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Uppdaterar..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Fel uppstod vid uppdatering av appen"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Fel"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Uppdatera"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Uppdaterad"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Välj en profilbild"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dekrypterar filer... Vänligen vänta, detta kan ta en stund."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Sparar..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "raderad"
@@ -190,40 +260,40 @@ msgstr "ångra"
 msgid "Unable to remove user"
 msgstr "Kan inte ta bort användare"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Grupper"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Gruppadministratör"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Radera"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "lägg till grupp"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Ett giltigt användarnamn måste anges"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Fel vid skapande av användare"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Ett giltigt lösenord måste anges"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Varning: Hem katalogen för varje användare \"{användare}\" finns redan"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -247,18 +317,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Ingen"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Logga in"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Säkerhetsvarning"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -267,68 +361,68 @@ msgid ""
 "root."
 msgstr "Din datakatalog och dina filer är förmodligen åtkomliga från internet. Filen .htaccess fungerar inte. Vi rekommenderar starkt att du konfigurerar din webbserver så att datakatalogen inte längre är åtkomlig eller du flyttar datakatalogen utanför webbserverns rotkatalog."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Installationsvarning"
 
-#: templates/admin.php:53
+#: 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 "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Vänligen dubbelkolla igenom <a href=\"%s\">installationsguiden</a>."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modulen \"fileinfo\" saknas"
 
-#: templates/admin.php:68
+#: 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 "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Locale fungerar inte"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Internetförbindelsen fungerar inte"
 
-#: templates/admin.php:121
+#: 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 "
@@ -337,118 +431,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Servern har ingen fungerande internetanslutning. Detta innebär att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Åtkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling för denna server om du vill ha alla funktioner."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Exekvera en uppgift vid varje sidladdning"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Använd systemets cron service att ropa på cron.php filen varje 15 minuter."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Dela"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Aktivera delat API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Tillåt applikationer att använda delat API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Tillåt länkar"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Tillåt delning till allmänheten via publika länkar"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Tillåt offentlig uppladdning"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Tillåt användare att aktivera\nTillåt användare att göra det möjligt för andra att ladda upp till sina offentligt delade mappar"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Tillåt vidaredelning"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Tillåt användare att dela vidare filer som delats med dem"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Tillåt delning med alla"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillåt bara delning med användare i egna grupper"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Tillåt e-post notifikation"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Tillåt användare att skicka e-port notifikationer för delade filer"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Säkerhet"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Kräv HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "Tvingar klienterna att ansluta till %s via en krypterad anslutning."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL"
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Serveradress"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Inloggningsuppgifter"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Nivå på loggning"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Mer"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Mindre"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Version"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -458,30 +612,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Lägg till din applikation"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Fler Appar"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Välj en App"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Se programsida på apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Användardokumentation"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Administratörsdokumentation"
@@ -515,7 +673,7 @@ msgstr "Visa Första uppstarts-guiden igen"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Lösenord"
 
@@ -527,151 +685,149 @@ msgstr "Ditt lösenord har ändrats"
 msgid "Unable to change your password"
 msgstr "Kunde inte ändra ditt lösenord"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Nuvarande lösenord"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Ändra lösenord"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Hela namnet"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-post"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Din e-postadress"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Fyll i en e-postadress för att aktivera återställning av lösenord"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profilbild"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Ladda upp ny"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Välj ny från filer"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Radera bild"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "Antingen png eller jpg. Helst fyrkantig, men du kommer att kunna beskära den."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr "Avbryt"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Välj som profilbild"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Språk"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Hjälp att översätta"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Kryptering"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Inloggningslösenord"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Dekryptera alla filer"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Inloggningsnamn"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Skapa"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Admin återställningslösenord"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Enter the recovery password in order to recover the users files during password change"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Förvald lagring"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Obegränsad"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Annat"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Användarnamn"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Lagring"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "ändra hela namnet"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "ange nytt lösenord"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Förvald"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 9ccf06aa4b..1b9e5d7a42 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -8,15 +8,16 @@
 # Jan Busk, 2013
 # Jonas Erlandsson <jonas.erlandsson@gmail.com>, 2013
 # kallemooo <karl.h.thoren@gmail.com>, 2013
+# lagre, 2014
 # Magnus Höglund <magnus@linux.com>, 2013
 # medialabs, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,43 +94,43 @@ msgstr "Lyckat"
 msgid "Error"
 msgstr "Fel"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Konfigurationen är OK"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Felaktig konfiguration"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Konfigurationen är ej komplett"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Välj grupper"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Välj Objekt-klasser"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Välj attribut"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Anslutningstestet lyckades"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Anslutningstestet misslyckades"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Vill du verkligen radera den nuvarande serverinställningen?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Bekräfta radering"
 
@@ -147,11 +148,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s användare hittad"
 msgstr[1] "%s användare hittade"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Felaktig Host"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "Det gick inte hitta den önskade funktionen"
 
@@ -169,8 +170,8 @@ msgstr "Hjälp"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "Begränsa åtkomsten till %s till grupper som möter följande kriterie:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -186,13 +187,13 @@ msgstr "endast ifrån de här grupperna:"
 #: templates/part.wizard-loginfilter.php:32
 #: templates/part.wizard-userfilter.php:25
 msgid "Edit raw filter instead"
-msgstr ""
+msgstr "Redigera rått filter istället"
 
 #: templates/part.wizard-groupfilter.php:30
 #: templates/part.wizard-loginfilter.php:37
 #: templates/part.wizard-userfilter.php:30
 msgid "Raw LDAP filter"
-msgstr ""
+msgstr "Rått LDAP-filter"
 
 #: templates/part.wizard-groupfilter.php:31
 #, php-format
@@ -205,8 +206,8 @@ msgid "groups found"
 msgstr "grupper hittade"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Vilket attribut ska användas som login namn:"
+msgid "Users login with this attribute:"
+msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -273,8 +274,8 @@ msgstr "Du kan ange start DN för användare och grupper under fliken Avancerat"
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
-msgstr "Begränsa åtkomsten till %s till användare som möter följande kriterie:"
+msgid "Limit %s access to users meeting these criteria:"
+msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
 #, php-format
@@ -416,41 +417,51 @@ msgstr "Gruppsökningsattribut"
 msgid "Group-Member association"
 msgstr "Attribut för gruppmedlemmar"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Specialattribut"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kvotfält"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Datakvot standard"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "E-postfält"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Namnregel för hemkatalog"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Internt Användarnamn"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -466,15 +477,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Som standard skapas det interna användarnamnet från UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillåtna:  [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas på vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärråtkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet åsidosättas. För att uppnå ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att påverka nyligen mappade (tillagda) LDAP-användare"
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Internt Användarnamn Attribut:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "Åsidosätt UUID detektion"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -485,19 +496,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "UUID Attribut för Användare:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "UUID Attribut för Grupper:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Användarnamn-LDAP User Mapping"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -511,10 +522,10 @@ msgid ""
 "experimental stage."
 msgstr "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Rensa Användarnamn-LDAP User Mapping"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Rensa Gruppnamn-LDAP Group Mapping"
diff --git a/l10n/sw_KE/core.po b/l10n/sw_KE/core.po
index 0c54b43c28..69c0afe6ac 100644
--- a/l10n/sw_KE/core.po
+++ b/l10n/sw_KE/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/sw_KE/files.po b/l10n/sw_KE/files.po
index c62ef36290..24c934753a 100644
--- a/l10n/sw_KE/files.po
+++ b/l10n/sw_KE/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/sw_KE/files_encryption.po b/l10n/sw_KE/files_encryption.po
index 268e020ef0..d431247af8 100644
--- a/l10n/sw_KE/files_encryption.po
+++ b/l10n/sw_KE/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/sw_KE/files_external.po b/l10n/sw_KE/files_external.po
index 7958c592cf..49157af4bc 100644
--- a/l10n/sw_KE/files_external.po
+++ b/l10n/sw_KE/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sw_KE/files_sharing.po b/l10n/sw_KE/files_sharing.po
index 443e8a546a..768ae9c285 100644
--- a/l10n/sw_KE/files_sharing.po
+++ b/l10n/sw_KE/files_sharing.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-21 13:01-0400\n"
-"PO-Revision-Date: 2013-10-21 17:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/sw_KE/files_trashbin.po b/l10n/sw_KE/files_trashbin.po
index c05cce48de..3dd0ee0259 100644
--- a/l10n/sw_KE/files_trashbin.po
+++ b/l10n/sw_KE/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/sw_KE/lib.po b/l10n/sw_KE/lib.po
index ea6aa2ed1c..09812f7f63 100644
--- a/l10n/sw_KE/lib.po
+++ b/l10n/sw_KE/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/sw_KE/settings.po b/l10n/sw_KE/settings.po
index c4d98fec5d..2703facb88 100644
--- a/l10n/sw_KE/settings.po
+++ b/l10n/sw_KE/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/sw_KE/user_ldap.po b/l10n/sw_KE/user_ldap.po
index 998150bf16..578d7e4aa0 100644
--- a/l10n/sw_KE/user_ldap.po
+++ b/l10n/sw_KE/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index 925e3c1f42..18b304ba11 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "ஞாயிற்றுக்கிழமை"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "திங்கட்கிழமை"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "செவ்வாய்க்கிழமை"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "புதன்கிழமை"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "வியாழக்கிழமை"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "வெள்ளிக்கிழமை"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "சனிக்கிழமை"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "தை"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "மாசி"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "பங்குனி"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "சித்திரை"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "வைகாசி"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "ஆனி"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "ஆடி"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "ஆவணி"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "புரட்டாசி"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "ஐப்பசி"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "கார்த்திகை"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "மார்கழி"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "சேமிக்கப்படுகிறது..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "இன்று"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "மாதங்களுக்கு முன்"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr "பகிர்வு"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "வழு"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "பகிரும் போதான வழு"
 
@@ -293,123 +303,123 @@ msgstr "பகிராமல் உள்ளப்போதான வழு"
 msgid "Error while changing permissions"
 msgstr "அனுமதிகள் மாறும்போதான வழு"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "காலாவதி தேதியை குறிப்பிடுக"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "காலவதியாகும் திகதி"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "மின்னஞ்சலினூடான பகிர்வு: "
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "நபர்கள் யாரும் இல்லை"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "குழு"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "மீள்பகிர்வதற்கு அனுமதி இல்லை "
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "பகிரப்படாதது"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "தொகுக்க முடியும்"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "கட்டுப்பாடான அணுகல்"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "உருவவாக்கல்"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "இற்றைப்படுத்தல்"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "நீக்குக"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "பகிர்தல்"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "எச்சரிக்கை"
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}"
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். "
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "பயனாளர் பெயர்"
 
@@ -517,6 +533,18 @@ msgstr "புதிய கடவுச்சொல்"
 msgid "Reset password"
 msgstr "மீளமைத்த கடவுச்சொல்"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "தனிப்பட்ட"
@@ -525,7 +553,7 @@ msgstr "தனிப்பட்ட"
 msgid "Users"
 msgstr "பயனாளர்"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "செயலிகள்"
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "உயர்ந்த"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "தரவு கோப்புறை"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "தரவுத்தளத்தை தகவமைக்க"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "பயன்படுத்தப்படும்"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "தரவுத்தள பயனாளர்"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "தரவுத்தள கடவுச்சொல்"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "தரவுத்தள பெயர்"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "தரவுத்தள அட்டவணை"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "தரவுத்தள ஓம்புனர்"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "அமைப்பை முடிக்க"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "விடுபதிகை செய்க"
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "ஞாபகப்படுத்துக"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "புகுபதிகை"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 2677f36e59..0dacc83010 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "பதிவேற்றப்பட்ட கோப்பானது HTML  படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE  directive ஐ விட கூடியது"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "எந்த கோப்பும் பதிவேற்றப்படவில்லை"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "வட்டில் எழுத முடியவில்லை"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "கோப்புகள்"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} ஏற்கனவே உள்ளது"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "பகிர்வு"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "பெயர்மாற்றம்"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "நிலுவையிலுள்ள"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "முன் செயல் நீக்கம் "
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "வழு"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "பெயர்"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "அளவு"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "மாற்றப்பட்டது"
 
@@ -301,12 +308,12 @@ msgstr "மாற்றப்பட்டது"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "பதிவேற்றுக"
 
@@ -342,72 +349,68 @@ msgstr "ZIP கோப்புகளுக்கான ஆகக்கூடி
 msgid "Save"
 msgstr "சேமிக்க "
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "புதிய"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "கோப்பு உரை"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "கோப்புறை"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "இணைப்பிலிருந்து"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "பதிவேற்றலை இரத்து செய்க"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "பதிவிறக்குக"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "பதிவேற்றல் மிகப்பெரியது"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "தற்போது வருடப்படுபவை"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 3916599a56..6f5ef1e912 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "சேமிக்கப்படுகிறது..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index cffd95fe90..a11995dfd6 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "அனுமதி வழங்கப்பட்டது"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Dropbox சேமிப்பை தகவமைப்பதில் வழு"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "அனுமதியை வழங்கல்"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. "
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "பயனாளர்"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "பயனாளர் அவர்களுடைய சொந்த வெளியக சேமிப்பை ஏற்ற அனுமதிக்க"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL வேர் சான்றிதழ்கள்"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "வேர் சான்றிதழை இறக்குமதி செய்க"
diff --git a/l10n/ta_LK/files_sharing.po b/l10n/ta_LK/files_sharing.po
index f575323658..345631dfe3 100644
--- a/l10n/ta_LK/files_sharing.po
+++ b/l10n/ta_LK/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "பகிரப்பட்டது {சொந்தகாரர்}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s கோப்புறையானது %s உடன் பகிரப்பட்டது"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s கோப்பானது %s உடன் பகிரப்பட்டது"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "பதிவிறக்குக"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "பதிவேற்றுக"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "பதிவேற்றலை இரத்து செய்க"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "அதற்கு முன்னோக்கு ஒன்றும் இல்லை"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ta_LK/files_trashbin.po b/l10n/ta_LK/files_trashbin.po
index 357812b351..db48899f2b 100644
--- a/l10n/ta_LK/files_trashbin.po
+++ b/l10n/ta_LK/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "வழு"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "பெயர்"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 0a623df524..fbe3d5f915 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "உதவி"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "தனிப்பட்ட"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "பயனாளர்"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "நிர்வாகம்"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது."
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "செயலி இயலுமைப்படுத்தப்படவில்லை"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "அத்தாட்சிப்படுத்தலில் வழு"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "அடையாளவில்லை காலாவதியாகிவிட்டது. தயவுசெய்து பக்கத்தை மீள் ஏற்றுக."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "கோப்புகள்"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "இன்று"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 2bfc1b80e9..aec5ad9de2 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "மறைக்குறியீடு"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது"
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "இயலுமைப்ப"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "இயலுமைப்படுத்துக"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "வழு"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "இற்றைப்படுத்தல்"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "சேமிக்கப்படுகிறது..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "முன் செயல் நீக்கம் "
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "குழுக்கள்"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "குழு நிர்வாகி"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "_மொழி_பெயர்_"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "ஒன்றுமில்லை"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "புகுபதிகை"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "பாதுகாப்பு எச்சரிக்கை"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "சேவையக முகவரி"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "துறை "
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "சான்று ஆவணங்கள்"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "மேலதிக"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "குறைவான"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +603,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "உங்களுடைய செயலியை சேர்க்க"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "மேலதிக செயலிகள்"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "செயலி ஒன்றை தெரிவுசெய்க"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com இல் செயலி பக்கத்தை பார்க்க"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"அனுமதிப்பத்திரம்\"></span>-அனுமதி பெற்ற <span class=\"ஆசிரியர்\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr ""
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr ""
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
@@ -518,151 +676,149 @@ msgstr "உங்களுடைய கடவுச்சொல் மாற்
 msgid "Unable to change your password"
 msgstr "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "தற்போதைய கடவுச்சொல்"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "புதிய கடவுச்சொல்"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "கடவுச்சொல்லை மாற்றுக"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "மின்னஞ்சல்"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "உங்களுடைய மின்னஞ்சல் முகவரி"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "இரத்து செய்க"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "மொழி"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "மொழிபெயர்க்க உதவி"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "மறைக்குறியீடு"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
-msgstr ""
+msgstr "புகுபதிகை"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "உருவாக்குக"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "மற்றவை"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "பயனாளர் பெயர்"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index d30912db7e..7095ac9958 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "வழு"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "உதவி"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr "நீங்கள் பயனாளர்களுக்கும் 
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr "குழு உறுப்பினர் சங்கம்"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "bytes களில் "
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/te/core.po b/l10n/te/core.po
index 4ba4480ce1..7387068662 100644
--- a/l10n/te/core.po
+++ b/l10n/te/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# వీవెన్ వీరపనేని <veeven@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +18,11 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +39,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +59,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "ఆదివారం"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "సోమవారం"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "మంగళవారం"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "బుధవారం"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "గురువారం"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "శుక్రవారం"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "శనివారం"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "జనవరి"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "ఫిబ్రవరి"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "మార్చి"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "ఏప్రిల్"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "మే"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "జూన్"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "జూలై"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "ఆగస్ట్"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "సెప్టెంబర్"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "అక్టోబర్"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "నవంబర్"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "డిసెంబర్"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "క్షణాల క్రితం"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n నిమిషం క్రితం"
+msgstr[1] "%n నిమిషాల క్రితం"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n గంట క్రితం"
+msgstr[1] "%n గంటల క్రితం"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "ఈరోజు"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "నిన్న"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n రోజు క్రితం"
+msgstr[1] "%n రోజుల క్రితం"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "పోయిన నెల"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%n నెల క్రితం"
+msgstr[1] "%n నెలల క్రితం"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "నెలల క్రితం"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "పోయిన సంవత్సరం"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
 
@@ -254,7 +245,7 @@ msgstr "రద్దుచేయి"
 
 #: js/oc-dialogs.js:386
 msgid "Continue"
-msgstr ""
+msgstr "కొనసాగించు"
 
 #: js/oc-dialogs.js:433 js/oc-dialogs.js:446
 msgid "(all selected)"
@@ -268,6 +259,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +287,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,125 +304,125 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "పంపించు"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "కాలం చెల్లు తేదీ"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "తొలగించు"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
-msgstr ""
+msgstr "హెచ్చరిక"
 
 #: js/tags.js:4
 msgid "The object type is not specified."
@@ -456,11 +467,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +497,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "వాడుకరి పేరు"
 
@@ -517,15 +534,27 @@ msgstr "కొత్త సంకేతపదం"
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
-msgstr ""
+msgstr "వ్యక్తిగతం"
 
 #: strings.php:6
 msgid "Users"
 msgstr "వాడుకరులు"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +664,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +720,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "నిష్క్రమించు"
 
@@ -719,27 +746,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "మీ సంకేతపదం పోయిందా?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/te/files.po b/l10n/te/files.po
index f1746363e6..23e4494a55 100644
--- a/l10n/te/files.po
+++ b/l10n/te/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,283 +17,290 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "శాశ్వతంగా తొలగించు"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "పేరు"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "పరిమాణం"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr "భద్రపరచు"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "కొత్త సంచయం"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "సంచయం"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/te/files_encryption.po b/l10n/te/files_encryption.po
index b9488099d4..c9545f4e68 100644
--- a/l10n/te/files_encryption.po
+++ b/l10n/te/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,18 +81,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -100,8 +100,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/te/files_external.po b/l10n/te/files_external.po
index 8cd62f867f..80198b3524 100644
--- a/l10n/te/files_external.po
+++ b/l10n/te/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "వాడుకరులు"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/te/files_sharing.po b/l10n/te/files_sharing.po
index b03f8b8576..a636a2615e 100644
--- a/l10n/te/files_sharing.po
+++ b/l10n/te/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/te/files_trashbin.po b/l10n/te/files_trashbin.po
index a8ea979cc3..4f95953300 100644
--- a/l10n/te/files_trashbin.po
+++ b/l10n/te/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "పేరు"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/te/lib.po b/l10n/te/lib.po
index 3490c68acb..f1cbfbcfc2 100644
--- a/l10n/te/lib.po
+++ b/l10n/te/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "సహాయం"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
-msgstr ""
+msgstr "వ్యక్తిగతం"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "అమరికలు"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "వాడుకరులు"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "క్షణాల క్రితం"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n నిమిషాల క్రితం"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n గంటల క్రితం"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "ఈరోజు"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "నిన్న"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n రోజుల క్రితం"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "పోయిన నెల"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
-msgstr[1] ""
+msgstr[1] "%n నెలల క్రితం"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "పోయిన సంవత్సరం"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "సంవత్సరాల క్రితం"
diff --git a/l10n/te/settings.po b/l10n/te/settings.po
index 475d990c39..b8c07e59ad 100644
--- a/l10n/te/settings.po
+++ b/l10n/te/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: te\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "తొలగించు"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "సేవకి చిరునామా"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "మరిన్ని"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "సంకేతపదం"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "కొత్త సంకేతపదం"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "ఈమెయిలు"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "మీ ఈమెయిలు చిరునామా"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "రద్దుచేయి"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "భాష"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "వాడుకరి పేరు"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/te/user_ldap.po b/l10n/te/user_ldap.po
index 8aa5f5df8b..d7bc4f0318 100644
--- a/l10n/te/user_ldap.po
+++ b/l10n/te/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/owncloud/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "పొరపాటు"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "సహాయం"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -285,7 +285,7 @@ msgstr ""
 
 #: templates/part.wizardcontrols.php:8
 msgid "Continue"
-msgstr ""
+msgstr "కొనసాగించు"
 
 #: templates/settings.php:11
 msgid ""
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 3bd1bd9070..eacfde04d8 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-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
@@ -18,41 +18,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:87
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:119 ajax/share.php:161
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
 
-#: ajax/update.php:11
+#: ajax/update.php:10
 msgid "Turned on maintenance mode"
 msgstr ""
 
-#: ajax/update.php:14
+#: ajax/update.php:13
 msgid "Turned off maintenance mode"
 msgstr ""
 
-#: ajax/update.php:17
+#: ajax/update.php:16
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -73,135 +59,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:872
+#: js/js.js:543
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:1103
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:1104
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:874
+#: js/js.js:1105
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1106
 msgid "today"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:1107
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:877
+#: js/js.js:1108
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:878
+#: js/js.js:1109
 msgid "last month"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1110
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:880
+#: js/js.js:1111
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:881
+#: js/js.js:1112
 msgid "last year"
 msgstr ""
 
-#: js/js.js:882
+#: js/js.js:1113
 msgid "years ago"
 msgstr ""
 
@@ -269,6 +259,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -277,12 +287,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -294,123 +304,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -457,11 +467,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -481,8 +497,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -518,6 +534,17 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:140
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:144
+msgid "For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -526,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -636,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -694,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -720,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 5396110aed..bc931be91d 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-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
@@ -18,281 +18,288 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:63
 #, php-format
-msgid ""
-"The name %s is already used in the folder %s. Please choose a different name."
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:81
-msgid "Not a valid source"
-msgstr ""
-
-#: ajax/newfile.php:86
-msgid ""
-"Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
-
-#: ajax/newfile.php:103
-#, php-format
-msgid "Error while downloading %s to %s"
-msgstr ""
-
-#: ajax/newfile.php:140
-msgid "Error when creating the file"
-msgstr ""
-
-#: ajax/newfolder.php:21
-msgid "Folder name cannot be empty."
-msgstr ""
-
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
-msgid "Error when creating the folder"
-msgstr ""
-
-#: ajax/upload.php:18 ajax/upload.php:50
-msgid "Unable to set upload directory."
-msgstr ""
-
-#: ajax/upload.php:27
-msgid "Invalid Token"
-msgstr ""
-
-#: ajax/upload.php:64
-msgid "No file was uploaded. Unknown error"
-msgstr ""
-
-#: ajax/upload.php:71
-msgid "There is no error, the file uploaded with success"
-msgstr ""
-
-#: ajax/upload.php:72
-msgid ""
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
-
-#: ajax/upload.php:74
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr ""
-
-#: ajax/upload.php:75
-msgid "The uploaded file was only partially uploaded"
-msgstr ""
-
-#: ajax/upload.php:76
-msgid "No file was uploaded"
-msgstr ""
-
-#: ajax/upload.php:77
-msgid "Missing a temporary folder"
-msgstr ""
-
-#: ajax/upload.php:78
-msgid "Failed to write to disk"
-msgstr ""
-
-#: ajax/upload.php:96
-msgid "Not enough storage available"
-msgstr ""
-
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
-msgid "Upload failed. Could not find uploaded file"
-msgstr ""
-
-#: ajax/upload.php:172
-msgid "Invalid directory."
-msgstr ""
-
-#: appinfo/app.php:11
-msgid "Files"
-msgstr ""
-
-#: js/file-upload.js:228
-msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr ""
-
-#: js/file-upload.js:306
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/file-upload.js:344
-msgid "Could not get result from server."
-msgstr ""
-
-#: js/file-upload.js:436
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/file-upload.js:523
-msgid "URL cannot be empty"
-msgstr ""
-
-#: js/file-upload.js:527 js/filelist.js:377
-msgid "In the home folder 'Shared' is a reserved filename"
-msgstr ""
-
-#: js/file-upload.js:529 js/filelist.js:379
-msgid "{new_name} already exists"
-msgstr ""
-
-#: js/file-upload.js:595
-msgid "Could not create file"
-msgstr ""
-
-#: js/file-upload.js:611
-msgid "Could not create folder"
-msgstr ""
-
-#: js/file-upload.js:661
-msgid "Error fetching URL"
-msgstr ""
-
-#: js/fileactions.js:125
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:137
-msgid "Delete permanently"
-msgstr ""
-
-#: js/fileactions.js:194
-msgid "Rename"
-msgstr ""
-
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
-msgid "Pending"
-msgstr ""
-
-#: js/filelist.js:405
-msgid "Could not rename file"
-msgstr ""
-
-#: js/filelist.js:539
-msgid "replaced {new_name} with {old_name}"
-msgstr ""
-
-#: js/filelist.js:539
-msgid "undo"
-msgstr ""
-
-#: js/filelist.js:591
-msgid "Error deleting file."
-msgstr ""
-
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/filelist.js:617
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:828 js/filelist.js:866
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr ""
-
-#: js/files.js:81
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:93
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different name."
+msgstr ""
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr ""
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr ""
+
+#: ajax/newfile.php:119
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr ""
+
+#: ajax/newfile.php:156
+msgid "Error when creating the file"
+msgstr ""
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr ""
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr ""
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr ""
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr ""
+
+#: ajax/upload.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr ""
+
+#: ajax/upload.php:78
+msgid "There is no error, the file uploaded with success"
+msgstr ""
+
+#: ajax/upload.php:79
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr ""
+
+#: ajax/upload.php:81
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr ""
+
+#: ajax/upload.php:82
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
+
+#: ajax/upload.php:83
+msgid "No file was uploaded"
+msgstr ""
+
+#: ajax/upload.php:84
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ajax/upload.php:85
+msgid "Failed to write to disk"
+msgstr ""
+
+#: ajax/upload.php:103
+msgid "Not enough storage available"
+msgstr ""
+
+#: ajax/upload.php:160
+msgid "Upload failed. Could not find uploaded file"
+msgstr ""
+
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
+msgid "Invalid directory."
+msgstr ""
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr ""
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr ""
+
+#: js/file-upload.js:477
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/file-upload.js:564
+msgid "URL cannot be empty"
+msgstr ""
+
+#: js/file-upload.js:568
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:570 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr ""
+
+#: js/file-upload.js:636
+msgid "Could not create file"
+msgstr ""
+
+#: js/file-upload.js:652
+msgid "Could not create folder"
+msgstr ""
+
+#: js/file-upload.js:702
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:164
+msgid "Share"
+msgstr ""
+
+#: js/fileactions.js:177
+msgid "Delete permanently"
+msgstr ""
+
+#: js/fileactions.js:238
+msgid "Rename"
+msgstr ""
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr ""
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr ""
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr ""
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:694
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:700
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr ""
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:382
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:613 js/files.js:657
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:613 js/files.js:657
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:675 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:676 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:677 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -300,12 +307,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -341,72 +348,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 31232e16fb..99f9cf030b 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-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
@@ -78,18 +78,18 @@ msgid ""
 "Unknown error please check your system settings or contact your administrator"
 msgstr ""
 
-#: hooks/hooks.php:62
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:63
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now, "
 "the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:281
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -97,8 +97,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index b8ac9956fa..6334e403e4 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-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
@@ -17,40 +17,44 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:467
+#: js/settings.js:318 js/settings.js:325
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:654
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:471
+#: lib/config.php:658
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting "
 "of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:474
+#: lib/config.php:661
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -85,39 +89,39 @@ msgstr ""
 msgid "Add storage"
 msgstr ""
 
-#: templates/settings.php:90
+#: templates/settings.php:93
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:91
+#: templates/settings.php:94
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:92
+#: templates/settings.php:95
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:100
+#: templates/settings.php:103
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:116 templates/settings.php:117
+#: templates/settings.php:158 templates/settings.php:159
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:130
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+#: templates/settings.php:133
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:150
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:168
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index d0daf4154b..8fbff46261 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-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
@@ -17,6 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index eadcdd9d3e..f9b4401c78 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-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
@@ -17,21 +17,25 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:108 js/trash.js:157
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:859 lib/trashbin.php:861
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 8ba48805ba..3381aea0a7 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-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
@@ -22,22 +22,22 @@ msgstr ""
 msgid "Could not revert: %s"
 msgstr ""
 
-#: js/versions.js:14
+#: js/versions.js:39
 msgid "Versions"
 msgstr ""
 
-#: js/versions.js:60
+#: js/versions.js:61
 msgid "Failed to revert {file} to revision {timestamp}."
 msgstr ""
 
-#: js/versions.js:86
+#: js/versions.js:88
 msgid "More versions..."
 msgstr ""
 
-#: js/versions.js:123
+#: js/versions.js:126
 msgid "No other versions available"
 msgstr ""
 
-#: js/versions.js:154
+#: js/versions.js:156
 msgid "Restore"
 msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 29ab50202b..10017472d1 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,44 +8,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: private/app.php:245
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version "
 "of ownCloud."
 msgstr ""
 
-#: private/app.php:257
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:362
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:375
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:386
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:398
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:411
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
@@ -62,105 +62,104 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
-#: private/files.php:226
+#: private/files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: private/files.php:227
+#: private/files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: private/files.php:228 private/files.php:256
+#: private/files.php:234 private/files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: private/files.php:253
+#: private/files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: private/files.php:254
+#: private/files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -194,13 +193,13 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
 #: 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 ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -208,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 ""
@@ -219,29 +218,29 @@ msgstr ""
 #: 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 ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -257,7 +256,7 @@ msgstr ""
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: 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 ""
 
@@ -269,66 +268,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:202
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index fd5e0fded5..12fa6ad930 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,44 +8,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: app.php:245
+#: app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version "
 "of ownCloud."
 msgstr ""
 
-#: app.php:257
+#: app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: app.php:362
+#: app.php:353
 msgid "Help"
 msgstr ""
 
-#: app.php:375
+#: app.php:366
 msgid "Personal"
 msgstr ""
 
-#: app.php:386
+#: app.php:377
 msgid "Settings"
 msgstr ""
 
-#: app.php:398
+#: app.php:389
 msgid "Users"
 msgstr ""
 
-#: app.php:411
+#: app.php:402
 msgid "Admin"
 msgstr ""
 
@@ -62,105 +62,104 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: defaults.php:34
+#: defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: files.php:66 files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
-#: files.php:226
+#: files.php:232
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:227
+#: files.php:233
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:228 files.php:256
+#: files.php:234 files.php:262
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:253
+#: files.php:259
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
-#: files.php:254
+#: files.php:260
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
 msgstr ""
 
-#: installer.php:63
+#: installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: installer.php:70
+#: installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: installer.php:75
+#: installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: installer.php:89
+#: installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: installer.php:103
+#: installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: installer.php:125
+#: installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: installer.php:131
+#: installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: installer.php:140
+#: installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: installer.php:146
+#: installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: installer.php:159
+#: installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: installer.php:169
+#: installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: installer.php:182
+#: installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: json.php:28
+#: json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: json.php:39 json.php:62 json.php:73
+#: json.php:40 json.php:63 json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: json.php:51
+#: json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: search/provider/file.php:18 search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -194,47 +193,47 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr ""
 
 #: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:114
-#: setup/postgresql.php:24 setup/postgresql.php:70
+#: setup/postgresql.php:31 setup/postgresql.php:84
 msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: setup/mysql.php:67 setup/oci.php:54 setup/oci.php:121 setup/oci.php:144
 #: setup/oci.php:151 setup/oci.php:162 setup/oci.php:169 setup/oci.php:178
 #: setup/oci.php:186 setup/oci.php:195 setup/oci.php:201
-#: setup/postgresql.php:89 setup/postgresql.php:98 setup/postgresql.php:115
-#: setup/postgresql.php:125 setup/postgresql.php:134
+#: setup/postgresql.php:103 setup/postgresql.php:112 setup/postgresql.php:129
+#: setup/postgresql.php:139 setup/postgresql.php:148
 #, php-format
 msgid "DB Error: \"%s\""
 msgstr ""
 
 #: setup/mysql.php:68 setup/oci.php:55 setup/oci.php:122 setup/oci.php:145
 #: setup/oci.php:152 setup/oci.php:163 setup/oci.php:179 setup/oci.php:187
-#: setup/oci.php:196 setup/postgresql.php:90 setup/postgresql.php:99
-#: setup/postgresql.php:116 setup/postgresql.php:126 setup/postgresql.php:135
+#: setup/oci.php:196 setup/postgresql.php:104 setup/postgresql.php:113
+#: setup/postgresql.php:130 setup/postgresql.php:140 setup/postgresql.php:149
 #, php-format
 msgid "Offending command was: \"%s\""
 msgstr ""
 
 #: setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: setup/oci.php:34
@@ -250,7 +249,7 @@ msgstr ""
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr ""
 
-#: setup/postgresql.php:23 setup/postgresql.php:69
+#: setup/postgresql.php:30 setup/postgresql.php:83
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
@@ -262,66 +261,71 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:195
+#: setup.php:202
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: setup.php:196
+#: setup.php:203
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: tags.php:194
+#: share/mailnotifications.php:73 share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: template/functions.php:130
+#: template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: template/functions.php:131
+#: template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:132
+#: template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:133
+#: template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: template/functions.php:134
+#: template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: template/functions.php:136
+#: template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:138
+#: template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: template/functions.php:139
+#: template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:141
+#: template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: template/functions.php:142
+#: template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index a25543919a..892d64a273 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-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
@@ -17,12 +17,54 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20 changepassword/controller.php:55
+#: ajax/togglegroups.php:20 changepassword/controller.php:49
 msgid "Authentication error"
 msgstr ""
 
@@ -84,88 +126,116 @@ msgstr ""
 msgid "Couldn't update app."
 msgstr ""
 
-#: changepassword/controller.php:20
+#: changepassword/controller.php:17
 msgid "Wrong password"
 msgstr ""
 
-#: changepassword/controller.php:42
+#: changepassword/controller.php:36
 msgid "No user supplied"
 msgstr ""
 
-#: changepassword/controller.php:74
+#: changepassword/controller.php:68
 msgid ""
 "Please provide an admin recovery password, otherwise all user data will be "
 "lost"
 msgstr ""
 
-#: changepassword/controller.php:79
+#: changepassword/controller.php:73
 msgid "Wrong admin recovery password. Please check the password and try again."
 msgstr ""
 
-#: changepassword/controller.php:87
+#: changepassword/controller.php:81
 msgid ""
 "Back-end doesn't support password change, but the users encryption key was "
 "successfully updated."
 msgstr ""
 
-#: changepassword/controller.php:92 changepassword/controller.php:103
+#: changepassword/controller.php:86 changepassword/controller.php:97
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -180,40 +250,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:48 personal.php:49
 msgid "__language_name__"
 msgstr ""
 
@@ -237,18 +307,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -257,68 +351,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -327,117 +421,177 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems "
+"wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 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\" "
@@ -446,29 +600,33 @@ msgid ""
 "General Public License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid ""
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid ""
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -504,7 +662,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -516,151 +674,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 5e79d17a11..d16fe0386e 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-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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"
@@ -87,43 +87,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -141,11 +141,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -163,7 +163,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -199,7 +199,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,40 +409,50 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It "
 "makes sure that the username is unique and characters do not need to be "
@@ -458,15 +468,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute "
 "is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -477,19 +487,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -503,10 +513,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index acf94225f5..d2e917267c 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-01-08 01:55-0500\n"
+"POT-Creation-Date: 2014-03-31 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/th_TH/core.po b/l10n/th_TH/core.po
index 0539d2cd29..cea1f81421 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,131 +58,135 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "วันอาทิตย์"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "วันจันทร์"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "วันอังคาร"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "วันพุธ"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "วันพฤหัสบดี"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "วันศุกร์"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "วันเสาร์"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "มกราคม"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "มีนาคม"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "เมษายน"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "มิถุนายน"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "กรกฏาคม"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "สิงหาคม"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "กันยายน"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "ตุลาคม"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "ธันวาคม"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "กำลังบันทึกข้อมูล..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "วินาที ก่อนหน้านี้"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "วันนี้"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "เดือน ที่ผ่านมา"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
 
@@ -263,6 +253,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "แชร์แล้ว"
@@ -271,12 +281,12 @@ msgstr "แชร์แล้ว"
 msgid "Share"
 msgstr "แชร์"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
 
@@ -288,123 +298,123 @@ msgstr "เกิดข้อผิดพลาดในการยกเลิ
 msgid "Error while changing permissions"
 msgstr "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "ถูกแชร์ให้กับคุณโดย {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "ส่งลิงก์ให้ทางอีเมล"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "ส่ง"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "กำหนดวันที่หมดอายุ"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "วันที่หมดอายุ"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "แชร์ผ่านทางอีเมล"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "ไม่พบบุคคลที่ต้องการ"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "กลุ่มผู้ใช้งาน"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "ได้แชร์ {item} ให้กับ {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "ยกเลิกการแชร์"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "สามารถแก้ไข"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "ระดับควบคุมการเข้าใช้งาน"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "สร้าง"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "อัพเดท"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "ลบ"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "แชร์"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "กำลังส่ง..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "ส่งอีเมล์แล้ว"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "คำเตือน"
 
@@ -451,11 +461,17 @@ msgstr "การอัพเดทไม่เป็นผลสำเร็จ
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้"
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}"
@@ -475,8 +491,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "ชื่อผู้ใช้งาน"
 
@@ -512,6 +528,18 @@ msgstr "รหัสผ่านใหม่"
 msgid "Reset password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "ส่วนตัว"
@@ -520,7 +548,7 @@ msgstr "ส่วนตัว"
 msgid "Users"
 msgstr "ผู้ใช้งาน"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "แอปฯ"
 
@@ -630,49 +658,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "ขั้นสูง"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "โฟลเดอร์เก็บข้อมูล"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "กำหนดค่าฐานข้อมูล"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "จะถูกใช้"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "ชื่อผู้ใช้งานฐานข้อมูล"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "รหัสผ่านฐานข้อมูล"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "ชื่อฐานข้อมูล"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "พื้นที่ตารางในฐานข้อมูล"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "ติดตั้งเรียบร้อยแล้ว"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +714,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
@@ -714,27 +740,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "ลืมรหัสผ่าน?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "จำรหัสผ่าน"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "เข้าสู่ระบบ"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index f0b7289c8d..7cb40f38e7 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,280 +17,287 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "ไม่สามารถย้าย %s ได้"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "ชื่อไฟล์ไม่สามารถเว้นว่างได้"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้"
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini"
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "ไม่มีไฟล์ที่ถูกอัพโหลด"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "โฟลเดอร์ชั่วคราวเกิดการสูญหาย"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "ไดเร็กทอรี่ไม่ถูกต้อง"
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "ไฟล์"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "มีพื้นที่เหลือไม่เพียงพอ"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} มีอยู่แล้วในระบบ"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "แชร์"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "แทนที่ {new_name} ด้วย {old_name} แล้ว"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' เป็นชื่อไฟล์ที่ไม่ถูกต้อง"
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้"
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "กำลังเตรียมดาวน์โหลดข้อมูล หากไฟล์มีขนาดใหญ่ อาจใช้เวลาสักครู่"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "ชื่อ"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "แก้ไขแล้ว"
 
@@ -298,12 +305,12 @@ msgstr "แก้ไขแล้ว"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "อัพโหลด"
 
@@ -339,72 +346,68 @@ msgstr "ขนาดไฟล์ ZIP สูงสุด"
 msgid "Save"
 msgstr "บันทึก"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "อัพโหลดไฟล์ใหม่"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "ไฟล์ข้อความ"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
-msgstr ""
+msgstr "โฟลเดอร์ใหม่"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "แฟ้มเอกสาร"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "จากลิงก์"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "ยกเลิกการอัพโหลด"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "กำลังอัพเกรดหน่วยความจำแคชของระบบไฟล์..."
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index 0626159891..737d2545c5 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "กำลังบันทึกข้อมูล..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index eef3790b5b..52bb6ec1dc 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "การเข้าถึงได้รับอนุญาตแล้ว"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "อนุญาตให้เข้าถึงได้"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>คำเตือน:</b> \"smbclient\" ยังไม่ได้ถูกติดตั้ง. การชี้ CIFS/SMB เพื่อแชร์ข้อมูลไม่สามารถกระทำได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>คำเตือน:</b> การสนับสนุนการใช้งาน FTP ในภาษา PHP ยังไม่ได้ถูกเปิดใช้งานหรือถูกติดตั้ง. การชี้ FTP เพื่อแชร์ข้อมูลไม่สามารถดำเนินการได้ กรุณาสอบถามข้อมูลเพิ่มเติมจากผู้ดูแลระบบเพื่อติดตั้ง"
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "ผู้ใช้งาน"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "อนุญาตให้ผู้ใช้งานสามารถชี้ตำแหน่งไปที่พื้นที่จัดเก็บข้อมูลภายนอกของตนเองได้"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 25147a511c..419cb84a3f 100644
--- a/l10n/th_TH/files_sharing.po
+++ b/l10n/th_TH/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "ถูกแชร์โดย {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s ได้แชร์โฟลเดอร์ %s ให้กับคุณ"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s ได้แชร์ไฟล์ %s ให้กับคุณ"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "ดาวน์โหลด"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "อัพโหลด"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "ยกเลิกการอัพโหลด"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "ไม่สามารถดูตัวอย่างได้สำหรับ"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/th_TH/files_trashbin.po b/l10n/th_TH/files_trashbin.po
index 658dfef49d..c111ab0ef1 100644
--- a/l10n/th_TH/files_trashbin.po
+++ b/l10n/th_TH/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "ชื่อ"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "คืนค่า"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "ลบแล้ว"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "ไฟล์ที่ลบทิ้ง"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 62f6738438..2257d7e995 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "ช่วยเหลือ"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "ส่วนตัว"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "ผู้ใช้งาน"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "ผู้ดูแล"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง"
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "ไฟล์"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,62 +267,68 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "ไม่พบหมวดหมู่ \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "วินาที ก่อนหน้านี้"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "วันนี้"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "เมื่อวานนี้"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "เดือนที่แล้ว"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "ปีที่แล้ว"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "ปี ที่ผ่านมา"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 6713c82ea4..050e1588f9 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "ส่งอีเมล์แล้ว"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "การเข้ารหัส"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "ไม่สามารถโหลดรายการจาก App Store ได้"
@@ -113,61 +155,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "อัพเดทไปเป็นรุ่น {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "ปิดใช้งาน"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "เปิดใช้งาน"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "กรุณารอสักครู่..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "กำลังอัพเดทข้อมูล..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "อัพเดท"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "อัพเดทแล้ว"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "กำลังบันทึกข้อมูล..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -181,40 +251,40 @@ msgstr "เลิกทำ"
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "ผู้ดูแลกลุ่ม"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "ลบ"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "ภาษาไทย"
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "ไม่มี"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "เข้าสู่ระบบ"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "คำเตือนเกี่ยวกับความปลอดภัย"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "การแชร์ข้อมูล"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "อนุญาตให้ใช้งานลิงก์ได้"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "ที่อยู่เซิร์ฟเวอร์"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "พอร์ต"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "ข้อมูลส่วนตัวสำหรับเข้าระบบ"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "ระดับการเก็บบันทึก log"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "มาก"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "น้อย"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "รุ่น"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +603,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "เพิ่มแอปของคุณ"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "แอปฯอื่นเพิ่มเติม"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "เลือก App"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ"
@@ -506,7 +664,7 @@ msgstr "แสดงหน้าจอวิซาร์ดนำทางคร
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "รหัสผ่าน"
 
@@ -518,151 +676,149 @@ msgstr "รหัสผ่านของคุณถูกเปลี่ยน
 msgid "Unable to change your password"
 msgstr "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "รหัสผ่านปัจจุบัน"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "รหัสผ่านใหม่"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "อีเมล"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "ที่อยู่อีเมล์ของคุณ"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "รูปภาพโปรไฟล์"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "ยกเลิก"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "ภาษา"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "ช่วยกันแปล"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "การเข้ารหัส"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "ชื่อที่ใช้สำหรับเข้าสู่ระบบ"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "สร้าง"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "พื้นที่จำกัดข้อมูลเริ่มต้น"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "ไม่จำกัดจำนวน"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "ชื่อผู้ใช้งาน"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "พื้นที่จัดเก็บข้อมูล"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "ตั้งค่ารหัสผ่านใหม่"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "ค่าเริ่มต้น"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 084d3ca8bd..1e29595c3f 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "เสร็จสิ้น"
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "เลือกกลุ่ม"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "ทดสอบการเชื่อมต่อสำเร็จ"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "ทดสอบการเชื่อมต่อล้มเหลว"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "ยืนยันการลบทิ้ง"
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr "ช่วยเหลือ"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr "คุณสามารถระบุ DN หลักสำหรั
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr "คุณลักษณะการค้นหาแบบกลุ่
 msgid "Group-Member association"
 msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "คุณลักษณะพิเศษ"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "ในหน่วยไบต์"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 8a80ed98df..09a1e3d278 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-05 01:55-0500\n"
-"PO-Revision-Date: 2014-01-04 20:50+0000\n"
+"POT-Creation-Date: 2014-03-28 01:55-0400\n"
+"PO-Revision-Date: 2014-03-27 19:31+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,12 +21,11 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s sizinle »%s« paylaşımında bulundu"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr "Son kullanma tarihi geçmişte."
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Şu kullanıcılara posta gönderilemedi: %s"
@@ -43,19 +42,6 @@ msgstr "Bakım kipi kapatıldı"
 msgid "Updated database"
 msgstr "Veritabanı güncellendi"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Dosya önbelleği güncelleniyor. Bu, gerçekten uzun sürebilir."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Dosya önbelleği güncellendi"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "%%%d tamamlandı ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Resim veya dosya belirtilmedi"
@@ -76,135 +62,139 @@ msgstr "Kullanılabilir geçici profil resmi yok, tekrar deneyin"
 msgid "No crop data provided"
 msgstr "Kesme verisi sağlanmamış"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Pazar"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Salı"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Cuma"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Ocak"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Şubat"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Mart"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Nisan"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Mayıs"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Haziran"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Temmuz"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Ağustos"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Eylül"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Ekim"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Kasım"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Aralık"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Kaydediliyor..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "saniye önce"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n dakika önce"
 msgstr[1] "%n dakika önce"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n saat önce"
 msgstr[1] "%n saat önce"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "bugün"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "dün"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n gün önce"
 msgstr[1] "%n gün önce"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "geçen ay"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n ay önce"
 msgstr[1] "%n ay önce"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "ay önce"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "geçen yıl"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "yıl önce"
 
@@ -272,6 +262,26 @@ msgstr "({count} seçildi)"
 msgid "Error loading file exists template"
 msgstr "Dosya mevcut şablonu yüklenirken hata"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr "Çok güçsüz parola"
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr "Güçsüz parola"
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr "Normal parola"
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr "İyi parola"
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr "Güçlü parola"
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Paylaşılan"
@@ -280,12 +290,12 @@ msgstr "Paylaşılan"
 msgid "Share"
 msgstr "Paylaş"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Hata"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Paylaşım sırasında hata  "
 
@@ -297,123 +307,123 @@ msgstr "Paylaşım iptal edilirken hata"
 msgid "Error while changing permissions"
 msgstr "İzinleri değiştirirken hata oluştu"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} tarafından sizinle ve {group} ile paylaştırılmış"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner} tarafından sizinle paylaşıldı"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Kullanıcı veya grup ile paylaş.."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Paylaşma bağlantısı"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Parola koruması"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Parola"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Genel Gönderime İzin Ver"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Bağlantıyı e-posta ile gönder"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Gönder"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Son kullanma tarihini ayarla"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Son kullanım tarihi"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "E-posta ile paylaş"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Kişi bulunamadı"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "grup"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Tekrar paylaşmaya izin verilmiyor"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "{item} içinde {user} ile paylaşılanlar"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Paylaşılmayan"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "e-posta ile bildir"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "düzenleyebilir"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "erişim kontrolü"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "oluştur"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "güncelle"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "sil"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "paylaş"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Parola korumalı"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Geçerlilik tarihi tanımlama kaldırma hatası"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Geçerlilik tarihi tanımlama hatası"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Gönderiliyor..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "E-posta gönderildi"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Uyarı"
 
@@ -460,11 +470,17 @@ msgstr "Güncelleme başarılı olmadı. Lütfen bu hatayı bildirin <a href=\"h
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Güncelleme başarılı. ownCloud'a yönlendiriliyor."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s parola sıfırlama"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr "E-posta gönderilirken bir hata oluştu. Lütfen yönetinizle iletişime geçin."
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}"
@@ -474,7 +490,7 @@ msgid ""
 "The link to reset your password has been sent to your email.<br>If you do "
 "not receive it within a reasonable amount of time, check your spam/junk "
 "folders.<br>If it is not there ask your local administrator ."
-msgstr "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk dizinini kontrol ediniz.<br> Eğer orada da bulamazsanız sistem yöneticinize sorunuz."
+msgstr "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi.<br>Eğer makül bir süre içerisinde mesajı almadıysanız spam/junk/gereksiz dizinini kontrol ediniz.<br> Eğer yine bulamazsanız sistem yöneticinize sorunuz."
 
 #: lostpassword/templates/lostpassword.php:15
 msgid "Request failed!<br>Did you make sure your email/username was right?"
@@ -484,8 +500,8 @@ msgstr "İstek başarısız!<br>E-posta ve/veya kullanıcı adınızın doğru o
 msgid "You will receive a link to reset your password via Email."
 msgstr "Parolanızı sıfırlamak için bir bağlantıyı e-posta olarak alacaksınız."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Kullanıcı Adı"
 
@@ -521,6 +537,18 @@ msgstr "Yeni parola"
 msgid "Reset password"
 msgstr "Parolayı sıfırla"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr "Mac OS X desteklenmemediğinden %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!"
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr "En iyi sonuçlar için GNU/Linux sunucusu kullanın."
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Kişisel"
@@ -529,7 +557,7 @@ msgstr "Kişisel"
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Uygulamalar"
 
@@ -639,49 +667,47 @@ msgstr "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=
 msgid "Create an <strong>admin account</strong>"
 msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Gelişmiş"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr "Depolama ve veritabanı"
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Veri klasörü"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Veritabanını ayarla"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "kullanılacak"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Veritabanı kullanıcı adı"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Veritabanı parolası"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Veritabanı adı"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Veritabanı tablo alanı"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Veritabanı sunucusu"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Tamamlanıyor .."
 
@@ -697,7 +723,7 @@ msgstr "Uygulama, doğru çalışabilmesi için JavaScript'in etkinleştirilmesi
 msgid "%s is available. Get more information on how to update."
 msgstr "%s mevcut. Güncelleştirme hakkında daha fazla bilgi alın."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Çıkış yap"
 
@@ -723,28 +749,28 @@ msgstr "Sunucu taraflı yetkilendirme başarısız!"
 msgid "Please contact your administrator."
 msgstr "Lütfen sistem yöneticisi ile iletişime geçin."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Parolanızı mı unuttunuz?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "hatırla"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Giriş yap"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Alternatif Girişler"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Merhaba, <br><br> %s sizinle »%s« paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>İyi günler!"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr "Merhaba, <br><br> %s sizinle <strong>%s</strong> paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>"
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 966906608b..3894fb0ad4 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-06 01:55-0500\n"
-"PO-Revision-Date: 2014-01-05 16:40+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,283 +21,290 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "%s taşınamadı - Bu isimde dosya zaten var"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "%s taşınamadı"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Dosya adı boş olamaz."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "Dosya adı \"/\" içermemelidir. Lütfen farklı bir isim seçin."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr "'%s' geçersiz bir dosya adı."
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr "Hedef klasör taşındı veya silindi."
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "%s ismi zaten %s klasöründe kullanılıyor. Lütfen farklı bir isim seçin."
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "Geçerli bir kaynak değil"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr "Sunucunun adresleri açma izi yok, lütfen sunucu yapılandırmasını denetleyin"
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "%s, %s içine indirilirken hata"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "Dosya oluşturulurken hata"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Klasör adı boş olamaz."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "Klasör adı \"/\" içermemelidir. Lütfen farklı bir isim seçin."
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "Klasör oluşturulurken hata"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Yükleme dizini tanımlanamadı."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "Geçersiz Simge"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Dosya yüklenmedi. Bilinmeyen hata"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Dosya başarıyla yüklendi, hata oluşmadı"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı."
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Dosya kısmen karşıya yüklenebildi"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Hiç dosya gönderilmedi"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Geçici dizin eksik"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Diske yazılamadı"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Yeterli disk alanı yok"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "Yükleme başarısız. Dosya bilgisi alınamadı."
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "Yükleme başarısız. Yüklenen dosya bulunamadı"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Yükleme başarısız. Dosya bilgisi alınamadı."
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Geçersiz dizin."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Dosyalar"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "Bir dizin veya 0 bayt olduğundan {filename} yüklenemedi"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Yeterli disk alanı yok"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr "Toplam dosya boyutu {size1} gönderme sınırını {size2} aşıyor"
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut"
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "Sunucudan sonuç alınamadı."
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL boş olamaz"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "Ev klasöründeki 'Paylaşılan', ayrılmış bir dosya adıdır"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Dosya oluşturulamadı"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Klasör oluşturulamadı"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr "Adres getirilirken hata"
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Paylaş"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Kalıcı olarak sil"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "İsim değiştir."
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Dosya adlandırılamadı"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ismi {old_name} ile değiştirildi"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr "Dosya silinirken hata."
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n dizin"
 msgstr[1] "%n dizin"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n dosya"
 msgstr[1] "%n dosya"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} ve {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n dosya yükleniyor"
 msgstr[1] "%n dosya yükleniyor"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' geçersiz bir dosya adı."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr "\"{name}\" geçersiz bir dosya adı."
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Geçersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek."
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Depolama alanınız neredeyse dolu ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "Şifreleme Uygulaması etkin ancak anahtarlarınız başlatılmamış. Lütfen oturumu kapatıp yeniden açın"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "Şifreleme Uygulaması için geçersiz özel anahtar. Lütfen şifreli dosyalarınıza erişimi tekrar kazanabilmek için kişisel ayarlarınızdan özel anahtar parolanızı güncelleyin."
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "Şifreleme işlemi durduruldu ancak dosyalarınız şifreli. Dosyalarınızın şifresini kaldırmak için lütfen kişisel ayarlar kısmına geçin."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "İndirmeniz hazırlanıyor. Dosya büyük ise biraz zaman alabilir."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Dosya taşıma hatası"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Hata"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "İsim"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Değiştirilme"
 
@@ -305,12 +312,12 @@ msgstr "Değiştirilme"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr "Geçersiz dizin adı. 'Shared' ismi ayrılmıştır."
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s yeniden adlandırılamadı"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Yükle"
 
@@ -346,72 +353,68 @@ msgstr "ZIP dosyaları için en fazla girdi boyutu"
 msgid "Save"
 msgstr "Kaydet"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Yeni"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr "Yeni metin dosyası"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Metin dosyası"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Yeni klasör"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Klasör"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Bağlantıdan"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Silinmiş dosyalar"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Yüklemeyi iptal et"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "Buraya dosya yükleme veya oluşturma izniniz yok"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiçbir şey yok. Bir şeyler yükleyin!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "İndir"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Yükleme çok büyük"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranıyor, lütfen bekleyin."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Güncel tarama"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Sistem dosyası önbelleği güncelleniyor"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index 6195623c1a..76d669faea 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # ismail yenigül <ismail.yenigul@surgate.com>, 2013
-# volkangezer <volkangezer@gmail.com>, 2013
+# volkangezer <volkangezer@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-02 17:27-0500\n"
-"PO-Revision-Date: 2013-11-30 01:40+0000\n"
+"POT-Creation-Date: 2014-03-13 01:55-0400\n"
+"PO-Revision-Date: 2014-03-12 10:51+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -82,18 +82,18 @@ msgid ""
 "administrator"
 msgstr "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "Gereklilikler eksik."
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğunu ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı"
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "Aşağıdaki kullanıcılar şifreleme için ayarlanmadılar:"
 
@@ -101,9 +101,9 @@ msgstr "Aşağıdaki kullanıcılar şifreleme için ayarlanmadılar:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin."
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Kaydediliyor..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin."
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index 849b546954..0a942596ce 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# volkangezer <volkangezer@gmail.com>, 2013
+# volkangezer <volkangezer@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
+"POT-Creation-Date: 2014-03-13 01:55-0400\n"
+"PO-Revision-Date: 2014-03-12 10:51+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Giriş kabul edildi"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Dropbox depo yapılandırma hatası"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Erişim sağlandı"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Lütfen Dropbox app key ve secret temin ediniz"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive depo yapılandırma hatası"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr "Kaydedildi"
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Uyarı:</b> \"smbclient\" kurulu değil. CIFS/SMB paylaşımlarını bağlama işlemi mümkün olmadı. Lütfen kurulumu için sistem yöneticinize danışın."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Uyarı:</b> PHP içerisinde FTP desteği etkin veya yüklü değil. FTP paylaşımlarını bağlama işlemi mümkün olmadı. Lütfen kurulumu için sistem yöneticinize danışın."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Kullanıcılar"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Kullanıcılar için Harici Depolamayı Etkinleştir"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Kullanıcıların kendi harici depolamalarını bağlamalarına izin ver"
+msgid "Allow users to mount the following external storage"
+msgstr "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver"
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL kök sertifikaları"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Kök Sertifikalarını İçe Aktar"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index f8e734d644..e12ff2554c 100644
--- a/l10n/tr/files_sharing.po
+++ b/l10n/tr/files_sharing.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# volkangezer <volkangezer@gmail.com>, 2013
+# volkangezer <volkangezer@gmail.com>, 2013-2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-13 14:43-0500\n"
-"PO-Revision-Date: 2013-12-13 19:00+0000\n"
+"POT-Creation-Date: 2014-03-13 01:55-0400\n"
+"PO-Revision-Date: 2014-03-12 10:51+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "{owner} tarafından paylaşılmış"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Bu paylaşım parola korumalı"
@@ -54,32 +58,16 @@ msgstr "paylaşım devre dışı"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişime geçin."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s, %s klasörünü sizinle paylaştı"
+msgid "shared by %s"
+msgstr "paylaşan: %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s, %s dosyasını sizinle paylaştı"
+msgid "Download %s"
+msgstr "İndir: %s"
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "İndir"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Yükle"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Yüklemeyi iptal et"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Kullanılabilir önizleme yok"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Doğrudan bağlantı"
diff --git a/l10n/tr/files_trashbin.po b/l10n/tr/files_trashbin.po
index 261cd7d30c..7ac32596ae 100644
--- a/l10n/tr/files_trashbin.po
+++ b/l10n/tr/files_trashbin.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: volkangezer <volkangezer@gmail.com>\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"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,44 +19,48 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "%s alıcı olarak silinemedi"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "%s eri yüklenemedi"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Silinmiş dosyalar"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Hata"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "geri yüklendi"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "İsim"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Geri yükle"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Silindi"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Sil"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Silinen Dosyalar"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 3237785ad4..d54faf7b56 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-06 01:55-0500\n"
-"PO-Revision-Date: 2014-01-05 16:40+0000\n"
+"POT-Creation-Date: 2014-03-13 01:55-0400\n"
+"PO-Revision-Date: 2014-03-12 10:51+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,34 +21,34 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: private/app.php:245
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "ownCloud yazılımının bu sürümü ile uyumlu olmadığı için \"%s\" uygulaması kurulamaz."
 
-#: private/app.php:257
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "Uygulama adı belirtimedli"
 
-#: private/app.php:362
+#: private/app.php:353
 msgid "Help"
 msgstr "Yardım"
 
-#: private/app.php:375
+#: private/app.php:366
 msgid "Personal"
 msgstr "Kişisel"
 
-#: private/app.php:386
+#: private/app.php:377
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: private/app.php:398
+#: private/app.php:389
 msgid "Users"
 msgstr "Kullanıcılar"
 
-#: private/app.php:411
+#: private/app.php:402
 msgid "Admin"
 msgstr "Yönetici"
 
@@ -65,15 +65,10 @@ msgstr "Bilinmeyen dosya türü"
 msgid "Invalid image"
 msgstr "Geçersiz resim"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "kontrolünüzün altındaki web hizmetleri"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "\"%s\" açılamıyor"
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP indirmeleri kapatıldı."
@@ -96,74 +91,78 @@ msgid ""
 "administrator."
 msgstr "Dosyaları ayrı ayrı, küçük parçalar halinde indirin veya yöneticinizden yardım isteyin. "
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "Uygulama kurulurken bir kaynak belirtilmedi"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "Uygulama kuruluyorken http'de href belirtilmedi"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "Uygulama yerel dosyadan kurulurken dosya yolu belirtilmedi"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "%s arşiv türü desteklenmiyor"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "Uygulama kuruluyorken arşiv dosyası açılamadı"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "Uygulama info.xml dosyası sağlamıyor"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor."
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor."
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "Uygulama kurulamıyor. Çünkü \"birlikte gelmeyen\" uygulamalar için <shipped>true</shipped> etiketi içeriyor"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "Uygulama kurulamıyor çünkü info.xml/version ile uygulama markette belirtilen sürüm aynı değil"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "Uygulama dizini zaten mevcut"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "Uygulama dizini oluşturulamıyor. Lütfen izinleri düzeltin. %s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Uygulama etkinleştirilmedi"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Kimlik doğrulama hatası"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Jetonun süresi geçti. Lütfen sayfayı yenileyin."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr "Bilinmeyen kullanıcı"
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Dosyalar"
@@ -197,23 +196,23 @@ msgid "MS SQL username and/or password not valid: %s"
 msgstr "MS SQL kullanıcı adı ve/veya parolası geçersiz: %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 "Bir konto veya kullanici birlemek ihtiyacin. "
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL kullanıcı adı ve/veya parolası geçerli değil"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr "MySQL/MariaDB kullanıcı adı ve/veya parolası geçersiz"
 
 #: 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 "DB Hata: ''%s''"
@@ -222,30 +221,30 @@ msgstr "DB Hata: ''%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 "Komut rahasiz ''%s''. "
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL kullanici '%s @local host zatan var. "
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr "MySQL/MariaDB kullanıcı '%s'@'localhost' zaten mevcut."
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Bu kullanici MySQLden list disari koymak. "
+msgid "Drop this user from MySQL/MariaDB"
+msgstr "Bu kullanıcıyı MySQL/MariaDB'dan at (drop)"
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL kullanici '%s @ % % zaten var (zaten yazili)"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr "MySQL/MariaDB kullanıcısı '%s'@'%%' zaten mevcut"
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Bu kullanıcıyı MySQL veritabanından kaldır"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr "Bu kullanıcıyı MySQL/MariaDB'dan at (drop)"
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -260,7 +259,7 @@ msgstr "Adi klullanici ve/veya parola Oracle mantikli değildir. "
 msgid "Offending command was: \"%s\", name: %s, password: %s"
 msgstr "Hatalı komut: \"%s\", ad: %s, parola: %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 adi kullanici ve/veya parola yasal degildir. "
 
@@ -272,66 +271,72 @@ msgstr "Bir adi kullanici vermek. "
 msgid "Set an admin password."
 msgstr "Parola yonetici birlemek. "
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s sizinle »%s« paylaşımında bulundu"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "\"%s\" kategorisi bulunamadı"
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "saniye önce"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] "%n dakika önce"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] "%n saat önce"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "bugün"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "dün"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] "%n gün önce"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "geçen ay"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] "%n ay önce"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "geçen yıl"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "yıl önce"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 80560004a5..cb9da3017d 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-06 01:55-0500\n"
-"PO-Revision-Date: 2014-01-05 16:40+0000\n"
+"POT-Creation-Date: 2014-03-28 01:55-0400\n"
+"PO-Revision-Date: 2014-03-27 19:31+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,48 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr "%s için geçersiz değer sağlandı"
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr "Kaydedildi"
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr "e-posta ayarlarını sına"
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor."
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı tekrar ziyaret edin."
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "E-posta gönderildi"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor."
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr "Gönderme kipi"
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Şifreleme"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr "Kimlik doğrulama yöntemi"
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "App Store'dan liste yüklenemiyor"
@@ -72,7 +114,7 @@ msgstr "Geçersiz istek"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr "Yöneticiler kendilerini yönetici grubundan kaldıramaz"
+msgstr "Yöneticiler kendilerini admin grubundan kaldıramaz"
 
 #: ajax/togglegroups.php:30
 #, php-format
@@ -117,65 +159,93 @@ msgstr "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme
 msgid "Unable to change password"
 msgstr "Parola değiştirilemiyor"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr "Gönderiliyor..."
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Kullanıcı Belgelendirmesi"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr "Yönetici Belgelendirmesi"
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "{appversion} Güncelle"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Devre dışı bırak"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Etkinleştir"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Lütfen bekleyin...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "Uygulama devre dışı bırakılırken hata"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "Uygulama etkinleştirilirken hata"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Güncelleniyor...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Uygulama güncellenirken hata"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Hata"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Güncelleme"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Güncellendi"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "Bir profil fotoğrafı seçin"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr "Çok güçsüz parola"
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr "Güçsüz parola"
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr "Normal parola"
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr "İyi parola"
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr "Güçlü parola"
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir."
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Kaydediliyor..."
-
 #: js/users.js:47
 msgid "deleted"
-msgstr "silindi"
+msgstr "silinen:"
 
 #: js/users.js:47
 msgid "undo"
@@ -185,40 +255,40 @@ msgstr "geri al"
 msgid "Unable to remove user"
 msgstr "Kullanıcı kaldırılamıyor"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Gruplar"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
-msgstr "Yönetici Grubu "
+msgstr "Grup Yöneticisi"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Sil"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "grup ekle"
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Geçerli bir kullanıcı adı mutlaka sağlanmalı"
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Kullanıcı oluşturulurken hata"
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Geçerli bir parola mutlaka sağlanmalı"
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "Türkçe"
 
@@ -242,18 +312,42 @@ msgstr "Hatalar ve ölümcül konular"
 msgid "Fatal issues only"
 msgstr "Sadece ölümcül konular"
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Hiçbiri"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Oturum Aç"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr "Düz"
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr "NT Ağ Yöneticisi"
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr "SSL"
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr "TLS"
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Güvenlik Uyarısı"
 
-#: templates/admin.php:25
+#: 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 konumuna HTTP aracılığıyla erişiyorsunuz. Sunucunuzu HTTPS kullanımını zorlaması üzere yapılandırmanızı şiddetle öneririz."
 
-#: templates/admin.php:39
+#: 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 "
@@ -262,68 +356,68 @@ msgid ""
 "root."
 msgstr "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. .htaccess  dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Kurulum Uyarısı"
 
-#: templates/admin.php:53
+#: 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 "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr "Lütfen <a href='%s'>kurulum kılavuzlarını</a> tekrar kontrol edin."
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Modül 'fileinfo' kayıp"
 
-#: templates/admin.php:68
+#: 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 "PHP modülü 'fileinfo' kayıp. MIME-tip tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr "PHP sürümünüz eski"
 
-#: templates/admin.php:82
+#: 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 sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır."
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Locale çalışmıyor."
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr "Sistem yereli, UTF-8 destekleyenlerden biri olarak ayarlanamadı"
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr "Bu, dosya adlarında belirli karakterlerde problem olabileceği anlamına gelir."
 
-#: templates/admin.php:106
+#: 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 "Şu dillerden birini desteklemesi için sisteminize gerekli paketleri kurmanızı şiddetle tavsiye ederiz: %s."
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "İnternet bağlantısı çalışmıyor"
 
-#: templates/admin.php:121
+#: 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 "
@@ -332,118 +426,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacak demektir. Uzak dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr "Son cron %s zamanında çalıştırıldı."
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor."
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr "Cron henüz çalıştırılmadı!"
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Yüklenen her sayfa ile bir görev çalıştır"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir."
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan."
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Paylaşım"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Paylaşım API'sini etkinleştir"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Uygulamaların paylaşım API'sini kullanmasına izin ver"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Bağlantılara izin ver"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Kullanıcıların ögeleri paylaşması için herkese açık bağlantılara izin ver"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "Herkes tarafından yüklemeye izin ver"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "Kullanıcıların, herkese açık dizinlerine, başkalarının dosya yüklemelerini etkinleştirmelerine izin ver"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Paylaşıma izin ver"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Kullanıcıların kendileri ile paylaşılan ögeleri yeniden paylaşmasına izin ver"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Kullanıcıların her şeyi paylaşmalarına izin ver"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "Posta bilgilendirmesine izin ver"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "Paylaşılmış dosyalar için kullanıcının posta bildirimi göndermesine izin ver"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Güvenlik"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "HTTPS bağlantısına zorla"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar."
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen ,%s'a HTTPS ile bağlanın."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr "E-Posta Sunucusu"
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr "Bu, bildirimler gönderilirken kullanılır."
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr "Kimden adresi"
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr "Kimlik doğrulama gerekli"
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Sunucu adresi"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Port"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Kimlik Bilgileri"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr "SMTP Kullanıcı Adı"
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr "SMTP Parolası"
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr "E-posta ayarlarını sına"
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr "E-posta gönder"
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Günlük seviyesi"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Daha fazla"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Az"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Sürüm"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -453,30 +607,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Uygulamanızı Ekleyin"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Daha Fazla Uygulama"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Bir Uygulama Seçin"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr "Belgelendirme:"
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Uygulamanın sayfasına apps.owncloud.com adresinden bakın "
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr "Uygulama web sitesine bakın"
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Kullanıcı Belgelendirmesi"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Yönetici Belgelendirmesi"
@@ -510,7 +668,7 @@ msgstr "İlk Çalıştırma Sihirbazını yeniden göster"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Parola"
 
@@ -522,151 +680,149 @@ msgstr "Şifreniz değiştirildi"
 msgid "Unable to change your password"
 msgstr "Parolanız değiştirilemiyor"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Mevcut parola"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Yeni parola"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Parola değiştir"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr "Tam Adı"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "E-posta"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "E-posta adresiniz"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Parola kurtarmayı etkinleştirmek için bir e-posta adresi girin"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr "Parola kurtarmayı ve bildirim almayı açmak için bir e-posta adresi girin"
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "Profil resmi"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "Yeni yükle"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "Dosyalardan seç"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "Resmi kaldır"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "PNG veya JPG. Genellikle karedir ancak kesebileceksiniz."
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr "Görüntü resminiz, özgün hesabınız tarafından sağlanıyor."
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "İptal Et"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "İptal"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "Profil resmi olarak seç"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Dil"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Çevirilere yardım edin"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Şifreleme"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr "Şifreleme uygulaması artık etkin değil, tüm dosyalarınızın şifrelemesini kaldırın"
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "Oturum açma parolası"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "Tüm dosyaların şifresini çöz"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Giriş Adı"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Oluştur"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "Yönetici Kurtarma Parolası"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için bir kurtarma paroalsı girin"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Varsayılan Depolama"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Limitsiz"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Diğer"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Kullanıcı Adı"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Depolama"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr "tam adı değiştir"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "yeni parola belirle"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Varsayılan"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 1a6e57acd8..33a02856eb 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # ismail yenigül <ismail.yenigul@surgate.com>, 2013
-# volkangezer <volkangezer@gmail.com>, 2013
+# volkangezer <volkangezer@gmail.com>, 2013-2014
 # KAT.RAT12 <spanish.katerina@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
 "Last-Translator: volkangezer <volkangezer@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -89,43 +89,43 @@ msgstr "Başarılı"
 msgid "Error"
 msgstr "Hata"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr "Yapılandırma tamam"
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr "Yapılandırma geçersiz"
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr "Yapılandırma tamamlanmamış"
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Grupları seç"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr "Nesne sınıflarını seç"
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr "Nitelikleri seç"
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Bağlantı testi başarılı oldu"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Bağlantı testi başarısız oldu"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Silmeyi onayla"
 
@@ -143,11 +143,11 @@ msgid_plural "%s users found"
 msgstr[0] "%s kullanıcı bulundu"
 msgstr[1] "%s kullanıcı bulundu"
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr "Geçersiz Makine"
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr "İstenen özellik bulunamadı"
 
@@ -165,8 +165,8 @@ msgstr "Yardım"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
-msgstr "%s erişimini, şu kriterle eşleşen gruplara sınırla:"
+msgid "Groups meeting these criteria are available in %s:"
+msgstr "Bu kriterle eşleşen gruplar %s içinde mevcut:"
 
 #: templates/part.wizard-groupfilter.php:8
 #: templates/part.wizard-userfilter.php:8
@@ -201,8 +201,8 @@ msgid "groups found"
 msgstr "grup bulundu"
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
-msgstr "Oturum ismi olarak hangi nitelik kullanılmalı:"
+msgid "Users login with this attribute:"
+msgstr "Bu nitelikle oturum açan kullanıcılar:"
 
 #: templates/part.wizard-loginfilter.php:8
 msgid "LDAP Username:"
@@ -269,7 +269,7 @@ msgstr "Base DN kullanicileri  ve kaynaklari icin tablosu Advanced tayin etmek e
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr "%s erişimini, şu kriterle eşleşen kullanıcılara sınırla:"
 
 #: templates/part.wizard-userfilter.php:31
@@ -412,41 +412,51 @@ msgstr "Kategorii Arama Grubu"
 msgid "Group-Member association"
 msgstr "Grup-Üye işbirliği"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr "İç içe Gruplar"
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr "Etkinleştirildiğinde, grup içeren gruplar desteklenir (Sadece grup üyesi DN niteliği içeriyorsa çalışır)."
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Özel Öznitelikler"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Kota Alanı"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Öntanımlı Kota"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "byte cinsinden"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "E-posta Alanı"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Kullanıcı Ana Dizini İsimlendirme Kuralı"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Kullanıcı adı bölümünü boş bırakın (varsayılan). "
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "Dahili Kullanıcı Adı"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -462,15 +472,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu yar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır."
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "Dahili Kullanıcı Adı Özniteliği:"
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "UUID tespitinin üzerine yaz"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -481,19 +491,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr "Öntanımlı olarak, UUID niteliği otomatik olarak tespit edilmez. UUID niteliği LDAP kullanıcılarını ve gruplarını şüphesiz biçimde tanımlamak için kullanılır. Ayrıca yukarıda belirtilmemişse, bu UUID'ye bağlı olarak dahili bir kullanıcı adı oluşturulacaktır. Bu ayarın üzerine yazabilir ve istediğiniz bir nitelik belirtebilirsiniz. Ancak istediğiniz niteliğin benzersiz olduğundan ve hem kullanıcı hem de gruplar tarafından getirilebileceğinden emin olmalısınız. Öntanımlı davranış için boş bırakın. Değişiklikler sadece yeni eşleştirilen (eklenen) LDAP kullanıcı ve gruplarında etkili olacaktır."
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr "Kullanıcılar için UUID Özniteliği:"
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr "Gruplar için UUID Özniteliği:"
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirme"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -507,10 +517,10 @@ msgid ""
 "experimental stage."
 msgstr "Kullanıcı adları, (üst) veri depolaması ve ataması için kullanılır. Kullanıcıları kesin olarak tanımlamak ve algılamak için, her LDAP kullanıcısı bir dahili kullanıcı adına sahip olacak. Bu kullanıcı adı ile LDAP kullanıcısı arasında bir eşleşme gerektirir. Oluşturulan kullanıcı adı LDAP kullanıcısının UUID'si ile eşleştirilir. Ek olarak LDAP etkileşimini azaltmak için DN de önbelleğe alınır ancak bu kimlik tanıma için kullanılmaz. Eğer DN değişirse, değişiklikler tespit edilir. Dahili kullanıcı her yerde kullanılır. Eşleştirmeleri temizlemek, her yerde kalıntılar bırakacaktır. Eşleştirmeleri temizlemek yapılandırmaya hassas bir şekilde bağlı değildir, tüm LDAP yapılandırmalarını etkiler! Üretim ortamında eşleştirmeleri asla temizlemeyin, sadece sınama veya deneysel aşamada kullanın."
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Temizle"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "Grup Adı-LDAP Grubu Eşleştirme"
diff --git a/l10n/tzm/core.po b/l10n/tzm/core.po
index def46cc5d7..5188ffa1f4 100644
--- a/l10n/tzm/core.po
+++ b/l10n/tzm/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/tzm/files.po b/l10n/tzm/files.po
index 86d9e057db..77cf857212 100644
--- a/l10n/tzm/files.po
+++ b/l10n/tzm/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/tzm/files_encryption.po b/l10n/tzm/files_encryption.po
index cf815c5e40..4056173547 100644
--- a/l10n/tzm/files_encryption.po
+++ b/l10n/tzm/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/tzm/files_external.po b/l10n/tzm/files_external.po
index 9c55bb693c..10b190ec86 100644
--- a/l10n/tzm/files_external.po
+++ b/l10n/tzm/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-03 12:38-0500\n"
-"PO-Revision-Date: 2013-11-02 11:38+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/tzm/files_sharing.po b/l10n/tzm/files_sharing.po
index 5cc2cdcf48..ba2c88b85d 100644
--- a/l10n/tzm/files_sharing.po
+++ b/l10n/tzm/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-03 12:38-0500\n"
-"PO-Revision-Date: 2013-11-02 11:38+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/tzm/files_trashbin.po b/l10n/tzm/files_trashbin.po
index 4a5d58092e..a872160a5b 100644
--- a/l10n/tzm/files_trashbin.po
+++ b/l10n/tzm/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-03 12:38-0500\n"
-"PO-Revision-Date: 2013-11-02 11:38+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/tzm/lib.po b/l10n/tzm/lib.po
index 643ca395d1..365568ea67 100644
--- a/l10n/tzm/lib.po
+++ b/l10n/tzm/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/tzm/settings.po b/l10n/tzm/settings.po
index eec7cdcf92..c8ed5177a5 100644
--- a/l10n/tzm/settings.po
+++ b/l10n/tzm/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/tzm/user_ldap.po b/l10n/tzm/user_ldap.po
index ea49db54ae..f4b3363e22 100644
--- a/l10n/tzm/user_ldap.po
+++ b/l10n/tzm/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ug/core.po b/l10n/ug/core.po
index 9de922dadc..a8ad67283d 100644
--- a/l10n/ug/core.po
+++ b/l10n/ug/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,131 +58,135 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "يەكشەنبە"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "دۈشەنبە"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "سەيشەنبە"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "چارشەنبە"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "پەيشەنبە"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "جۈمە"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "شەنبە"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "قەھرىتان"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "ھۇت"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "نەۋرۇز"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "ئۇمۇت"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "باھار"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "سەپەر"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "چىللە"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "تومۇز"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "مىزان"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "ئوغۇز"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "ئوغلاق"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "كۆنەك"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "ساقلاۋاتىدۇ…"
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "بۈگۈن"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "تۈنۈگۈن"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -263,6 +253,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -271,12 +281,12 @@ msgstr ""
 msgid "Share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -288,123 +298,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "ئىم"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "يوللا"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "گۇرۇپپا"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "ھەمبەھىرلىمە"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "ئۆچۈر"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "ھەمبەھىر"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "ئاگاھلاندۇرۇش"
 
@@ -451,11 +461,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -475,8 +491,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "ئىشلەتكۈچى ئاتى"
 
@@ -512,6 +528,18 @@ msgstr "يېڭى ئىم"
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "شەخسىي"
@@ -520,7 +548,7 @@ msgstr "شەخسىي"
 msgid "Users"
 msgstr "ئىشلەتكۈچىلەر"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "ئەپلەر"
 
@@ -630,49 +658,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "ئالىي"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "تەڭشەك تامام"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +714,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "تىزىمدىن چىق"
 
@@ -714,27 +740,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ug/files.po b/l10n/ug/files.po
index d510267975..99023de9b6 100644
--- a/l10n/ug/files.po
+++ b/l10n/ug/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,280 +17,287 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "%s يۆتكىيەلمەيدۇ"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "ھېچقانداق ھۆججەت يۈكلەنمىدى"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "ۋاقىتلىق قىسقۇچ كەم."
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "دىسكىغا يازالمىدى"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "يېتەرلىك ساقلاش بوشلۇقى يوق"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "ھۆججەتلەر"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "يېتەرلىك بوشلۇق يوق"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "يۈكلەشتىن ۋاز كەچتى."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ھۆججەت يۈكلەش مەشغۇلاتى ئېلىپ بېرىلىۋاتىدۇ. Leaving the page now will cancel the upload."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} مەۋجۇت"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "ھەمبەھىر"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "مەڭگۈلۈك ئۆچۈر"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "ئات ئۆزگەرت"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "كۈتۈۋاتىدۇ"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "يېنىۋال"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "ئاتى"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "چوڭلۇقى"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "ئۆزگەرتكەن"
 
@@ -298,12 +305,12 @@ msgstr "ئۆزگەرتكەن"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "يۈكلە"
 
@@ -339,72 +346,68 @@ msgstr ""
 msgid "Save"
 msgstr "ساقلا"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "يېڭى"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "تېكىست ھۆججەت"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "يېڭى قىسقۇچ"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "قىسقۇچ"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "ئۆچۈرۈلگەن ھۆججەتلەر"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "يۈكلەشتىن ۋاز كەچ"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "بۇ جايدا ھېچنېمە يوق. Upload something!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "چۈشۈر"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "يۈكلەندىغىنى بەك چوڭ"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "ھۆججەت سىستېما غەملىكىنى يۈكسەلدۈرۈۋاتىدۇ…"
diff --git a/l10n/ug/files_encryption.po b/l10n/ug/files_encryption.po
index 81b13d3fef..c781d1dd9f 100644
--- a/l10n/ug/files_encryption.po
+++ b/l10n/ug/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,9 +99,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "ساقلاۋاتىدۇ…"
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/ug/files_external.po b/l10n/ug/files_external.po
index 013bb4e3bb..f757592a12 100644
--- a/l10n/ug/files_external.po
+++ b/l10n/ug/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Abduqadir Abliz <sahran.ug@gmail.com>\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"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "ئىشلەتكۈچىلەر"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ug/files_sharing.po b/l10n/ug/files_sharing.po
index 7a99ab9d73..96d546aec2 100644
--- a/l10n/ug/files_sharing.po
+++ b/l10n/ug/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -54,32 +58,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "چۈشۈر"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "يۈكلە"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "يۈكلەشتىن ۋاز كەچ"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ug/files_trashbin.po b/l10n/ug/files_trashbin.po
index 47ee287491..9f90cc10b2 100644
--- a/l10n/ug/files_trashbin.po
+++ b/l10n/ug/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "ئۆچۈرۈلگەن ھۆججەتلەر"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "خاتالىق"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "ئاتى"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "ئۆچۈرۈلدى"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/ug/lib.po b/l10n/ug/lib.po
index 92d05caf93..d3d58129f5 100644
--- a/l10n/ug/lib.po
+++ b/l10n/ug/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "ياردەم"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "شەخسىي"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "تەڭشەكلەر"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "ئىشلەتكۈچىلەر"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "سالاھىيەت دەلىللەش خاتالىقى"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "ھۆججەتلەر"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,62 +267,68 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "بۈگۈن"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "تۈنۈگۈن"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ug/settings.po b/l10n/ug/settings.po
index e4fba698bd..a304d79b2f 100644
--- a/l10n/ug/settings.po
+++ b/l10n/ug/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: ug\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "شىفىرلاش"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "ئەپ بازىرىدىن تىزىمنى يۈكلىيەلمىدى"
@@ -114,61 +156,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "ئىشلەتكۈچى قوللانمىسى"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "{appversion} غا يېڭىلايدۇ"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "چەكلە"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "قوزغات"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "سەل كۈتۈڭ…"
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "يېڭىلاۋاتىدۇ…"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "يېڭىلا"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "يېڭىلاندى"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "ساقلاۋاتىدۇ…"
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -182,40 +252,40 @@ msgstr "يېنىۋال"
 msgid "Unable to remove user"
 msgstr "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "گۇرۇپپا"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "گۇرۇپپا باشقۇرغۇچى"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "گۇرۇپپا قوش"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "ئۇيغۇرچە"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "يوق"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "تىزىمغا كىرىڭ"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "بىخەتەرلىك ئاگاھلاندۇرۇش"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "ئاگاھلاندۇرۇش تەڭشەك"
 
-#: templates/admin.php:53
+#: 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:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان"
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "ھەمبەھىر"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "بىخەتەرلىك"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "مۇلازىمېتىر ئادرىسى"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "ئېغىز"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "خاتىرە"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "خاتىرە دەرىجىسى"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "تېخىمۇ كۆپ"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "ئاز"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "نەشرى"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,29 +604,33 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "ئەپىڭىزنى قوشۇڭ"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "تېخىمۇ كۆپ ئەپلەر"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "بىر ئەپ تاللاڭ"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "ئىشلەتكۈچى قوللانمىسى"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:6
 msgid "Administrator Documentation"
@@ -507,7 +665,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "ئىم"
 
@@ -519,151 +677,149 @@ msgstr "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى"
 msgid "Unable to change your password"
 msgstr "ئىمنى ئۆزگەرتكىلى بولمايدۇ."
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "نۆۋەتتىكى ئىم"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "يېڭى ئىم"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "ئىم ئۆزگەرت"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "تورخەت"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "تورخەت ئادرېسىڭىز"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "ئىم ئەسلىگە كەلتۈرۈشتە ئىشلىتىدىغان تور خەت ئادرېسىنى تولدۇرۇڭ"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "ۋاز كەچ"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "تىل"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "تەرجىمىگە ياردەم"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "شىفىرلاش"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "تىزىمغا كىرىش ئاتى"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "قۇر"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "كۆڭۈلدىكى ساقلىغۇچ"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "چەكسىز"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "باشقا"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "ئىشلەتكۈچى ئاتى"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "ساقلىغۇچ"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "يېڭى ئىم تەڭشە"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "كۆڭۈلدىكى"
diff --git a/l10n/ug/user_ldap.po b/l10n/ug/user_ldap.po
index 781e2e7cbb..4ac58f5836 100644
--- a/l10n/ug/user_ldap.po
+++ b/l10n/ug/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Uighur (http://www.transifex.com/projects/p/owncloud/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "خاتالىق"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr "ياردەم"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index dd19baeb3b..31bbc3a69d 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,12 +18,11 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s розподілено »%s« з тобою"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "Неможливо надіслати пошту наступним користувачам: %s "
@@ -40,19 +39,6 @@ msgstr "Вимкнено захищений режим"
 msgid "Updated database"
 msgstr "Базу даних оновлено"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "Оновлення файлового кешу, це може тривати доволі довго..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "Файловий кеш оновлено"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "... %d%% виконано ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "Немає наданого зображення або файлу"
@@ -73,139 +59,143 @@ msgstr "Немає доступного тимчасового профілю д
 msgid "No crop data provided"
 msgstr "Немає інформації щодо обрізки даних"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Неділя"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Понеділок"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Середа"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Четвер"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Субота"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Січень"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Лютий"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Березень"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Квітень"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Травень"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Червень"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Липень"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Серпень"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Вересень"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Жовтень"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Листопад"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Грудень"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Зберігаю..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "секунди тому"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n хвилину тому"
 msgstr[1] "%n хвилини тому"
 msgstr[2] "%n хвилин тому"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n годину тому"
 msgstr[1] "%n години тому"
 msgstr[2] "%n годин тому"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "сьогодні"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "вчора"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n день тому"
 msgstr[1] "%n дні тому"
 msgstr[2] "%n днів тому"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "минулого місяця"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n місяць тому"
 msgstr[1] "%n місяці тому"
 msgstr[2] "%n місяців тому"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "місяці тому"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "минулого року"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "роки тому"
 
@@ -274,6 +264,26 @@ msgstr "({count} вибрано)"
 msgid "Error loading file exists template"
 msgstr "Помилка при завантаженні файлу існуючого шаблону"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "Опубліковано"
@@ -282,12 +292,12 @@ msgstr "Опубліковано"
 msgid "Share"
 msgstr "Поділитися"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Помилка"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Помилка під час публікації"
 
@@ -299,123 +309,123 @@ msgstr "Помилка під час відміни публікації"
 msgid "Error while changing permissions"
 msgstr "Помилка при зміні повноважень"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr " {owner} опублікував для Вас та для групи {group}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner} опублікував для Вас"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "Поділитися з користувачем або групою ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "Опублікувати посилання"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Захистити паролем"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Пароль"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "Дозволити Публічне Завантаження"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Ел. пошта належить Пану"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Надіслати"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Встановити термін дії"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Термін дії"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Опублікувати через Ел. пошту:"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Жодної людини не знайдено"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "група"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Пере-публікація не дозволяється"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Опубліковано {item} для {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Закрити доступ"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "повідомити по Email"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "може редагувати"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "контроль доступу"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "створити"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "оновити"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "видалити"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "опублікувати"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Захищено паролем"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Помилка при відміні терміна дії"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Помилка при встановленні терміна дії"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Надсилання..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Ел. пошта надіслана"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Попередження"
 
@@ -462,11 +472,17 @@ msgstr "Оновлення виконалось неуспішно. Будь л
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s пароль скинуто"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Використовуйте наступне посилання для скидання пароля: {link}"
@@ -486,8 +502,8 @@ msgstr "Запит завершився невдало !<br>Ви перекон
 msgid "You will receive a link to reset your password via Email."
 msgstr "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Ім'я користувача"
 
@@ -523,6 +539,18 @@ msgstr "Новий пароль"
 msgid "Reset password"
 msgstr "Скинути пароль"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Особисте"
@@ -531,7 +559,7 @@ msgstr "Особисте"
 msgid "Users"
 msgstr "Користувачі"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Додатки"
 
@@ -641,49 +669,47 @@ msgstr "Для отримання інформації, як правильно
 msgid "Create an <strong>admin account</strong>"
 msgstr "Створити <strong>обліковий запис адміністратора</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Додатково"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Каталог даних"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Налаштування бази даних"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "буде використано"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Користувач бази даних"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Пароль для бази даних"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Назва бази даних"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Таблиця бази даних"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Хост бази даних"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "Завершується ..."
 
@@ -699,7 +725,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s доступний. Отримай більше інформації про те, як оновити."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Вихід"
 
@@ -725,28 +751,28 @@ msgstr "Помилка аутентифікації на боці Сервера
 msgid "Please contact your administrator."
 msgstr "Будь ласка, зверніться до вашого Адміністратора."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Забули пароль?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "запам'ятати"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Вхід"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Альтернативні Логіни"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "Агов,<br><br>просто щоб ви знали, що %s поділився »%s« з вами.<br><a href=\"%s\">Подивіться на це !</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 61871c27be..310553d948 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,286 +18,293 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Не вдалося перемістити %s - Файл з таким ім'ям вже існує"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Не вдалося перемістити %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr " Ім'я файлу не може бути порожнім."
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені."
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "Ім'я теки не може бути порожнім."
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "Не вдалося встановити каталог завантаження."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "Не завантажено жодного файлу. Невідома помилка"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "Файл успішно вивантажено без помилок."
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: "
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Розмір відвантаженого файлу перевищує директиву MAX_FILE_SIZE вказану в HTML формі"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "Файл відвантажено лише частково"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "Не відвантажено жодного файлу"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "Відсутній тимчасовий каталог"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "Невдалося записати на диск"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "Місця більше немає"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "Невірний каталог."
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "Файли"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Місця більше немає"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження."
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL не може бути порожнім"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} вже існує"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "Не вдалося створити файл"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "Не вдалося створити теку"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "Поділитися"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "Видалити назавжди"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "Перейменувати"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "Неможливо перейменувати файл"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "замінено {new_name} на {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n тека"
 msgstr[1] "%n тека"
 msgstr[2] "%n теки"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n файл"
 msgstr[1] "%n файлів"
 msgstr[2] "%n файли"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' це невірне ім'я файлу."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені."
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Ваше сховище майже повне ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Ваше завантаження готується. Це може зайняти деякий час, якщо файли завеликі."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "Помилка переміщення файлу"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Помилка"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Ім'я"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Змінено"
 
@@ -305,12 +312,12 @@ msgstr "Змінено"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s не може бути перейменований"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Вивантажити"
 
@@ -346,72 +353,68 @@ msgstr "Максимальний розмір завантажуємого ZIP 
 msgid "Save"
 msgstr "Зберегти"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "Створити"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Текстовий файл"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Нова тека"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Тека"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "З посилання"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "Видалено файлів"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Перервати завантаження"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Тут нічого немає. Відвантажте що-небудь!"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Файл занадто великий"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Файли скануються, зачекайте, будь-ласка."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Поточне сканування"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Оновлення кеша файлової системи..."
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 6f9b8b6f19..0df9952e26 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,18 +81,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -100,9 +100,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Зберігаю..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index 09086c8728..397ecc48c4 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: Soul Kim <warlock.rf@gmail.com>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Доступ дозволено"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Помилка при налаштуванні сховища Dropbox"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Дозволити доступ"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Будь ласка, надайте дійсний ключ та пароль Dropbox."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Помилка при налаштуванні сховища Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Попередження:</b> Клієнт \"smbclient\" не встановлено. Під'єднанатися до CIFS/SMB тек неможливо. Попрохайте системного адміністратора встановити його."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Попередження:</b> Підтримка FTP в PHP не увімкнута чи не встановлена. Під'єднанатися до FTP тек неможливо. Попрохайте системного адміністратора встановити її."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Користувачі"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Активувати користувацькі зовнішні сховища"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Дозволити користувачам монтувати власні зовнішні сховища"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL корневі сертифікати"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Імпортувати корневі сертифікати"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 2f9913608f..b54f300956 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-28 14:30+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Опублікував {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "Цей ресурс обміну захищений паролем"
@@ -54,32 +58,16 @@ msgstr "обмін заборонений"
 msgid "For more info, please ask the person who sent this link."
 msgstr "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання."
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s опублікував каталог %s для Вас"
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s опублікував файл %s для Вас"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Завантажити"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Вивантажити"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Перервати завантаження"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Попередній перегляд недоступний для"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr "Пряме посилання"
diff --git a/l10n/uk/files_trashbin.po b/l10n/uk/files_trashbin.po
index 786eb3db30..1a07d7de31 100644
--- a/l10n/uk/files_trashbin.po
+++ b/l10n/uk/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "Неможливо видалити %s назавжди"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Неможливо відновити %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "Видалено файлів"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Помилка"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "відновлено"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Нічого немає. Ваший кошик для сміття пустий!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Ім'я"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Відновити"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Видалено"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "Видалено Файлів"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index 09e55936d2..bba2705281 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Допомога"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Особисте"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Налаштування"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Користувачі"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Адмін"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr "Невідомий тип файлу"
 msgid "Invalid image"
 msgstr "Невірне зображення"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "підконтрольні Вам веб-сервіси"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP завантаження вимкнено."
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Додаток не увімкнений"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Помилка автентифікації"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Файли"
@@ -199,8 +198,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "Вам потрібно ввести або існуючий обліковий запис або administrator."
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL ім'я користувача та/або пароль не дійсні"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -227,21 +226,21 @@ msgstr "Команда, що викликала проблему: \"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "Користувач MySQL '%s'@'localhost' вже існує."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "Видалити цього користувача з MySQL"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "Користувач MySQL '%s'@'%%' вже існує"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "Видалити цього користувача з MySQL."
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -268,70 +267,76 @@ msgstr "Встановіть ім'я адміністратора."
 msgid "Set an admin password."
 msgstr "Встановіть пароль адміністратора."
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s розподілено »%s« з тобою"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "Не вдалося знайти категорію \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "секунди тому"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "%n хвилин тому"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "%n годин тому"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "сьогодні"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "вчора"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "%n днів тому"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "минулого місяця"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] "%n місяців тому"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "минулого року"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "роки тому"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index f941a9e46c..3b7a588fc6 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Ел. пошта надіслана"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Шифрування"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Не вдалося завантажити список з App Store"
@@ -114,61 +156,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Документація Користувача"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Оновити до {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Включити"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Зачекайте, будь ласка..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Оновлюється..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Помилка при оновленні програми"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Помилка"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Оновити"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Оновлено"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Зберігаю..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -182,40 +252,40 @@ msgstr "відмінити"
 msgid "Unable to remove user"
 msgstr "Неможливо видалити користувача"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Групи"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Адміністратор групи"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Видалити"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "додати групу"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "Потрібно задати вірне ім'я користувача"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "Помилка при створенні користувача"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "Потрібно задати вірний пароль"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Жоден"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Логін"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Попередження про небезпеку"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "Попередження при Налаштуванні"
 
-#: templates/admin.php:53
+#: 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 "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний."
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "Модуль 'fileinfo' відсутній"
 
-#: templates/admin.php:68
+#: 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 "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "Локалізація не працює"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "Інтернет-з'єднання не працює"
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Виконати одне завдання для кожної завантаженої сторінки "
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Спільний доступ"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Увімкнути API спільного доступу"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Дозволити програмам використовувати API спільного доступу"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Дозволити посилання"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Дозволити користувачам відкривати спільний доступ до елементів за допомогою посилань"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Дозволити перевідкривати спільний доступ"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Дозволити користувачам знову відкривати спільний доступ до елементів, які вже відкриті для доступу"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Дозволити користувачам відкривати спільний доступ для всіх"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "Безпека"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "Примусове застосування HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Адреса сервера"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Порт"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Облікові дані"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Протокол"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "Рівень протоколювання"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "Більше"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "Менше"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Версія"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +604,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Додати свою програму"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Більше програм"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Вибрати додаток"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Перегляньте сторінку програм на apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Документація Користувача"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Документація Адміністратора"
@@ -507,7 +665,7 @@ msgstr "Показувати Майстер Налаштувань знову"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Пароль"
 
@@ -519,151 +677,149 @@ msgstr "Ваш пароль змінено"
 msgid "Unable to change your password"
 msgstr "Не вдалося змінити Ваш пароль"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Поточний пароль"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Новий пароль"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Ел.пошта"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Ваша адреса електронної пошти"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Введіть адресу електронної пошти для відновлення паролю"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Відмінити"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Мова"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Допомогти з перекладом"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Шифрування"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Ім'я Логіну"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Створити"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "сховище за замовчуванням"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Необмежено"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Інше"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Ім'я користувача"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Сховище"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "встановити новий пароль"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "За замовчуванням"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 4077c9fcbf..0e0f846c7f 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "Успіх"
 msgid "Error"
 msgstr "Помилка"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Оберіть групи"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "Перевірка з'єднання пройшла успішно"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "Перевірка з'єднання завершилась неуспішно"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "Підтвердіть Видалення"
 
@@ -142,11 +142,11 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr "Допомога"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -200,7 +200,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -268,7 +268,7 @@ msgstr "Ви можете задати Базовий DN для користув
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -411,41 +411,51 @@ msgstr "Пошукові Атрибути Групи"
 msgid "Group-Member association"
 msgstr "Асоціація Група-Член"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Спеціальні Атрибути"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "Поле Квоти"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "Квота за замовчанням"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "Поле Ел. пошти"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "Правило іменування домашньої теки користувача"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -461,15 +471,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -480,19 +490,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -506,10 +516,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ur/core.po b/l10n/ur/core.po
index 862ab145c3..4a075757d6 100644
--- a/l10n/ur/core.po
+++ b/l10n/ur/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 23:45+0000\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:872
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:874
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:877
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:878
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:880
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:881
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:882
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -293,123 +303,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -517,6 +533,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -525,7 +553,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ur/files.po b/l10n/ur/files.po
index ecfa869763..c8212b63c8 100644
--- a/l10n/ur/files.po
+++ b/l10n/ur/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 23:45+0000\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ur/files_encryption.po b/l10n/ur/files_encryption.po
index 3e4b7ec4a7..f8e7504486 100644
--- a/l10n/ur/files_encryption.po
+++ b/l10n/ur/files_encryption.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 23:45+0000\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"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:62
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:63
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:281
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/ur/files_external.po b/l10n/ur/files_external.po
index 480a799b4e..7d2c65defb 100644
--- a/l10n/ur/files_external.po
+++ b/l10n/ur/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 23:45+0000\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"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:467
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:471
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:474
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ur/files_sharing.po b/l10n/ur/files_sharing.po
index 1dd85cf47f..fa231b4c39 100644
--- a/l10n/ur/files_sharing.po
+++ b/l10n/ur/files_sharing.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 23:45+0000\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"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ur/files_trashbin.po b/l10n/ur/files_trashbin.po
index d1b08db59f..01c3eab2d4 100644
--- a/l10n/ur/files_trashbin.po
+++ b/l10n/ur/files_trashbin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 23:45+0000\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"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,21 +17,25 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:63
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:43
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:45 js/trash.js:88 js/trash.js:142
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:905 lib/trashbin.php:907
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/ur/lib.po b/l10n/ur/lib.po
index ba1af659a1..eff2c9afe6 100644
--- a/l10n/ur/lib.po
+++ b/l10n/ur/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 23:45+0000\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"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,34 +17,34 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:245
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:257
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:362
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:375
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:386
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:398
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:411
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ur/settings.po b/l10n/ur/settings.po
index f068880aa5..4461002aca 100644
--- a/l10n/ur/settings.po
+++ b/l10n/ur/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 23:45+0000\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:454
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:455 js/users.js:461 js/users.js:476
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:460
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:484
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ur/user_ldap.po b/l10n/ur/user_ldap.po
index 8d5790eea9..52d4b1c41d 100644
--- a/l10n/ur/user_ldap.po
+++ b/l10n/ur/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-01-07 01:55-0500\n"
-"PO-Revision-Date: 2014-01-06 23:45+0000\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"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/ur_PK/core.po b/l10n/ur_PK/core.po
index c91328a17a..dd41da4e86 100644
--- a/l10n/ur_PK/core.po
+++ b/l10n/ur_PK/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,135 +58,139 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "جنوری"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "فرورئ"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "مارچ"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "اپریل"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "مئی"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "جون"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "جولائی"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "اگست"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "ستمبر"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "اکتوبر"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "نومبر"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "دسمبر"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "سیٹینگز"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -268,6 +258,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -276,12 +286,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "ایرر"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "شئیرنگ کے دوران ایرر"
 
@@ -293,123 +303,123 @@ msgstr "شئیرنگ ختم کرنے  کے دوران ایرر"
 msgid "Error while changing permissions"
 msgstr "اختیارات کو تبدیل کرنے کے دوران ایرر"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "پاسورڈ سے محفوظ کریں"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "پاسورڈ"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "تاریخ معیاد سیٹ کریں"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "تاریخ معیاد"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "کوئی لوگ نہیں ملے۔"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "دوبارہ شئیر کرنے کی اجازت نہیں"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "شئیرنگ ختم کریں"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "ایڈٹ کر سکے"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "اسیس کنٹرول"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "نیا بنائیں"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "اپ ڈیٹ"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "ختم کریں"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "شئیر کریں"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "پاسورڈ سے محفوظ کیا گیا ہے"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -456,11 +466,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}"
@@ -480,8 +496,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "یوزر نیم"
 
@@ -517,6 +533,18 @@ msgstr "نیا پاسورڈ"
 msgid "Reset password"
 msgstr "ری سیٹ پاسورڈ"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "ذاتی"
@@ -525,7 +553,7 @@ msgstr "ذاتی"
 msgid "Users"
 msgstr "یوزرز"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "ایپز"
 
@@ -635,49 +663,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "ایڈوانسڈ"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "ڈیٹا فولڈر"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "ڈیٹا بیس کونفگر کریں"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "استعمال ہو گا"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "ڈیٹابیس یوزر"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "ڈیٹابیس پاسورڈ"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "ڈیٹابیس کا نام"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "ڈیٹابیس ٹیبل سپیس"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "ڈیٹابیس ہوسٹ"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "سیٹ اپ ختم کریں"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -693,7 +719,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "لاگ آؤٹ"
 
@@ -719,27 +745,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "کیا آپ پاسورڈ بھول گئے ہیں؟"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "یاد رکھیں"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "لاگ ان"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/ur_PK/files.po b/l10n/ur_PK/files.po
index 53afc26e54..a30d1be966 100644
--- a/l10n/ur_PK/files.po
+++ b/l10n/ur_PK/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,236 +76,231 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "ایرر"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -301,12 +308,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -342,72 +349,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/ur_PK/files_encryption.po b/l10n/ur_PK/files_encryption.po
index c233b6408d..7530d0584f 100644
--- a/l10n/ur_PK/files_encryption.po
+++ b/l10n/ur_PK/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/ur_PK/files_external.po b/l10n/ur_PK/files_external.po
index 267556951c..097c73271c 100644
--- a/l10n/ur_PK/files_external.po
+++ b/l10n/ur_PK/files_external.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-05-25 02:01+0200\n"
-"PO-Revision-Date: 2013-05-24 13:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:16 js/google.js:34
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:66
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:36 js/google.js:93
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:431
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:434
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:437
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "یوزرز"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ur_PK/files_sharing.po b/l10n/ur_PK/files_sharing.po
index 7f9353d72e..923108eaea 100644
--- a/l10n/ur_PK/files_sharing.po
+++ b/l10n/ur_PK/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/ur_PK/files_trashbin.po b/l10n/ur_PK/files_trashbin.po
index 3673a0eda0..0d58e5738a 100644
--- a/l10n/ur_PK/files_trashbin.po
+++ b/l10n/ur_PK/files_trashbin.po
@@ -6,10 +6,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-10-10 22:26-0400\n"
-"PO-Revision-Date: 2013-10-11 02:27+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "ایرر"
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:9
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:23
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:26 templates/index.php:28
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:37 templates/index.php:38
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/ur_PK/lib.po b/l10n/ur_PK/lib.po
index 68279cb5bf..91edc05d6a 100644
--- a/l10n/ur_PK/lib.po
+++ b/l10n/ur_PK/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "مدد"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "ذاتی"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "سیٹینگز"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "یوزرز"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "ایڈمن"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "آپ کے اختیار میں ویب سروسیز"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,66 +267,72 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/ur_PK/settings.po b/l10n/ur_PK/settings.po
index 616f657a6f..302512f11a 100644
--- a/l10n/ur_PK/settings.po
+++ b/l10n/ur_PK/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: ur_PK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "ایرر"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "پاسورڈ"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "نیا پاسورڈ"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "منسوخ کریں"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "یوزر نیم"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/ur_PK/user_ldap.po b/l10n/ur_PK/user_ldap.po
index b42df7fedf..9210c2d915 100644
--- a/l10n/ur_PK/user_ldap.po
+++ b/l10n/ur_PK/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/owncloud/language/ur_PK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr "ایرر"
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "مدد"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/uz/core.po b/l10n/uz/core.po
index 88fdaf0459..7b8fa16a1d 100644
--- a/l10n/uz/core.po
+++ b/l10n/uz/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-07 22:26-0500\n"
-"PO-Revision-Date: 2013-12-08 03:26+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,131 +58,135 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr ""
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr ""
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr ""
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr ""
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr ""
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr ""
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr ""
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr ""
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr ""
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr ""
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr ""
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr ""
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr ""
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr ""
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr ""
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr ""
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr ""
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr ""
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr ""
 
-#: js/js.js:387
+#: js/js.js:458
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:858
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:859
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:860
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:861
+#: js/js.js:998
 msgid "today"
 msgstr ""
 
-#: js/js.js:862
+#: js/js.js:999
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:863
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:864
+#: js/js.js:1001
 msgid "last month"
 msgstr ""
 
-#: js/js.js:865
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:866
+#: js/js.js:1003
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:867
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:868
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -263,6 +253,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr ""
@@ -271,12 +281,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr ""
 
@@ -288,123 +298,123 @@ msgstr ""
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr ""
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr ""
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr ""
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr ""
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr ""
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -451,11 +461,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr ""
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
@@ -475,8 +491,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr ""
 
@@ -512,6 +528,18 @@ msgstr ""
 msgid "Reset password"
 msgstr ""
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr ""
@@ -520,7 +548,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr ""
 
@@ -630,49 +658,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:67
-msgid "Advanced"
+#: templates/installation.php:70
+msgid "Storage & database"
 msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +714,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
@@ -714,27 +740,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr ""
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/uz/files.po b/l10n/uz/files.po
index 4e49c02a55..a432f0ef9c 100644
--- a/l10n/uz/files.po
+++ b/l10n/uz/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-19 01:55-0500\n"
-"PO-Revision-Date: 2013-12-19 06:55+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-20 01:55-0400\n"
+"PO-Revision-Date: 2014-03-20 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,36 +27,48 @@ msgstr ""
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:57 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
 #: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:68 ajax/newfolder.php:27 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: 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 ""
+
+#: ajax/newfile.php:87 ajax/newfolder.php:46 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:96
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:101
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:118
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:155
 msgid "Error when creating the file"
 msgstr ""
 
@@ -64,233 +76,228 @@ msgstr ""
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:65
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:67
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:74
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:75
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:77
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:78
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:79
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:80
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:81
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:99
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:156
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:166
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:185
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr ""
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:338
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:383
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:475
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:562
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:566
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:568 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:634
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:650
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:700
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr ""
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr ""
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr ""
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -298,12 +305,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr ""
 
@@ -339,72 +346,68 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/uz/files_encryption.po b/l10n/uz/files_encryption.po
index 5b96117b26..12d51b25dd 100644
--- a/l10n/uz/files_encryption.po
+++ b/l10n/uz/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/uz/files_external.po b/l10n/uz/files_external.po
index 1df26fb07d..f0b9b80128 100644
--- a/l10n/uz/files_external.po
+++ b/l10n/uz/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-09 01:44-0500\n"
-"PO-Revision-Date: 2013-11-07 08:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr ""
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/uz/files_sharing.po b/l10n/uz/files_sharing.po
index 2215fc5052..fd65efd753 100644
--- a/l10n/uz/files_sharing.po
+++ b/l10n/uz/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-09 01:44-0500\n"
-"PO-Revision-Date: 2013-11-07 08:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -55,30 +59,14 @@ msgstr ""
 
 #: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:20
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:28 templates/public.php:94
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:45 templates/public.php:48
-msgid "Upload"
-msgstr ""
-
-#: templates/public.php:58
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:91
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:98
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/uz/files_trashbin.po b/l10n/uz/files_trashbin.po
index f1f40775ea..63c93aa279 100644
--- a/l10n/uz/files_trashbin.po
+++ b/l10n/uz/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-09 01:44-0500\n"
-"PO-Revision-Date: 2013-11-07 08:41+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:814 lib/trashbin.php:816
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr ""
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/uz/lib.po b/l10n/uz/lib.po
index 185fc1265c..1c2263d3a0 100644
--- a/l10n/uz/lib.po
+++ b/l10n/uz/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-17 06:45-0500\n"
-"PO-Revision-Date: 2013-12-17 11:45+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr ""
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr ""
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,62 +267,68 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/uz/settings.po b/l10n/uz/settings.po
index 85917efc0b..0e253ad5c7 100644
--- a/l10n/uz/settings.po
+++ b/l10n/uz/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr ""
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr ""
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr ""
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr ""
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr ""
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr ""
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr ""
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr ""
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
+#: templates/personal.php:111
+msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr ""
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr ""
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/uz/user_ldap.po b/l10n/uz/user_ldap.po
index bad631e44a..e93eae4a9d 100644
--- a/l10n/uz/user_ldap.po
+++ b/l10n/uz/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-27 12:08-0500\n"
-"PO-Revision-Date: 2013-11-27 17:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,17 +25,17 @@ msgstr ""
 msgid "Failed to delete the server configuration"
 msgstr ""
 
-#: ajax/testConfiguration.php:37
+#: ajax/testConfiguration.php:39
 msgid "The configuration is valid and the connection could be established!"
 msgstr ""
 
-#: ajax/testConfiguration.php:40
+#: ajax/testConfiguration.php:42
 msgid ""
 "The configuration is valid, but the Bind failed. Please check the server "
 "settings and credentials."
 msgstr ""
 
-#: ajax/testConfiguration.php:44
+#: ajax/testConfiguration.php:46
 msgid ""
 "The configuration is invalid. Please have a look at the logs for further "
 "details."
@@ -86,43 +86,43 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:777
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:786
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:795
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:812 js/settings.js:821
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:815 js/settings.js:824
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:818
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:845
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:852
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:861
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:862
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:779 lib/wizard.php:791
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:952
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr ""
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 0c0eabbd17..48a4e5f7c7 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -3,14 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nguyễn Tài <mattheu.9x@gmail.com>, 2014
+# namphongbody <tunglam062000@gmail.com>, 2014
+# Sơn Nguyễn <sonnghit@gmail.com>, 2014
 # xtdv <truong.tx8@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,186 +21,176 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "Không thể gửi thư cho người dùng: %s"
 
 #: ajax/update.php:11
 msgid "Turned on maintenance mode"
-msgstr ""
+msgstr "Bật chế độ bảo trì"
 
 #: ajax/update.php:14
 msgid "Turned off maintenance mode"
-msgstr ""
+msgstr "Tắt chế độ bảo trì"
 
 #: ajax/update.php:17
 msgid "Updated database"
-msgstr ""
-
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
+msgstr "Cơ sở dữ liệu đã được cập nhật"
 
 #: avatar/controller.php:62
 msgid "No image or file provided"
-msgstr ""
+msgstr "Không có hình ảnh hoặc tập tin được cung cấp"
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
-msgstr ""
+msgstr "Không biết kiểu tập tin"
 
 #: avatar/controller.php:85
 msgid "Invalid image"
-msgstr ""
+msgstr "Hình ảnh không hợp lệ"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "Ảnh cá nhân tạm thời không có giá trị, hãy thử lại"
 
 #: avatar/controller.php:135
 msgid "No crop data provided"
-msgstr ""
+msgstr "Không có dữ liệu nguồn được cung cấp"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "Thứ 2"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "Thứ 3"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "Thứ 4"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "Thứ 5"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "Thứ "
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "Thứ 7"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "Tháng 1"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "Tháng 2"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "Tháng 3"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "Tháng 4"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "Tháng 5"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "Tháng 6"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "Tháng 7"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "Tháng 8"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "Tháng 9"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "Tháng 10"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "Tháng 11"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "Tháng 12"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "Đang lưu..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "vài giây trước"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n phút trước"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n giờ trước"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "hôm nay"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n ngày trước"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "tháng trước"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n tháng trước"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "tháng trước"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "năm trước"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "năm trước"
 
@@ -207,7 +200,7 @@ msgstr "Chọn"
 
 #: js/oc-dialogs.js:146
 msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "Lỗi khi tải mẫu tập tin picker: {error}"
 
 #: js/oc-dialogs.js:172
 msgid "Yes"
@@ -223,26 +216,26 @@ msgstr "Đồng ý"
 
 #: js/oc-dialogs.js:219
 msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "Lỗi khi tải mẫu thông điệp: {error}"
 
 #: js/oc-dialogs.js:347
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
-msgstr[0] ""
+msgstr[0] "{count} tập tin xung đột"
 
 #: js/oc-dialogs.js:361
 msgid "One file conflict"
-msgstr ""
+msgstr "Một tập tin xung đột"
 
 #: js/oc-dialogs.js:367
 msgid "Which files do you want to keep?"
-msgstr ""
+msgstr "Bạn muốn tiếp tục với những tập tin nào?"
 
 #: js/oc-dialogs.js:368
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr ""
+msgstr "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó."
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
@@ -250,18 +243,38 @@ msgstr "Hủy"
 
 #: js/oc-dialogs.js:386
 msgid "Continue"
-msgstr ""
+msgstr "Tiếp tục"
 
 #: js/oc-dialogs.js:433 js/oc-dialogs.js:446
 msgid "(all selected)"
-msgstr ""
+msgstr "(Tất cả các lựa chọn)"
 
 #: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "({count} selected)"
-msgstr ""
+msgstr "({count} được chọn)"
 
 #: js/oc-dialogs.js:457
 msgid "Error loading file exists template"
+msgstr "Lỗi khi tải tập tin mẫu đã tồn tại"
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
 msgstr ""
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
@@ -272,12 +285,12 @@ msgstr "Được chia sẻ"
 msgid "Share"
 msgstr "Chia sẻ"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "Lỗi"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "Lỗi trong quá trình chia sẻ"
 
@@ -289,123 +302,123 @@ msgstr "Lỗi trong quá trình gỡ chia sẻ"
 msgid "Error while changing permissions"
 msgstr "Lỗi trong quá trình phân quyền"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "Đã được chia sẽ bởi {owner}"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
-msgstr ""
+msgstr "Chia sẻ với người dùng hoặc nhóm"
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
-msgstr ""
+msgstr "Chia sẻ liên kết"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
-msgstr ""
+msgstr "Cho phép công khai tập tin tải lên"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "Liên kết email tới cá nhân"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "Gởi"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "Đặt ngày kết thúc"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "Ngày kết thúc"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "Chia sẻ thông qua email"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "Không tìm thấy người nào"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "nhóm"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "Chia sẻ lại không được cho phép"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "Đã được chia sẽ trong {item} với {user}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "Bỏ chia sẻ"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
-msgstr ""
+msgstr "Thông báo qua email"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "có thể chỉnh sửa"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "quản lý truy cập"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "tạo"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "cập nhật"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "xóa"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "chia sẻ"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "Lỗi không thiết lập ngày kết thúc"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "Lỗi cấu hình ngày kết thúc"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "Đang gởi ..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email đã được gửi"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "Cảnh báo"
 
@@ -415,7 +428,7 @@ msgstr "Loại đối tượng không được chỉ định."
 
 #: js/tags.js:13
 msgid "Enter new"
-msgstr ""
+msgstr "Nhập mới"
 
 #: js/tags.js:27
 msgid "Delete"
@@ -427,19 +440,19 @@ msgstr "Thêm"
 
 #: js/tags.js:39
 msgid "Edit tags"
-msgstr ""
+msgstr "Sửa thẻ"
 
 #: js/tags.js:57
 msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "Lỗi khi tải mẫu hội thoại: {error}"
 
 #: js/tags.js:261
 msgid "No tags selected for deletion."
-msgstr ""
+msgstr "Không có thẻ nào được chọn để xóa"
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr ""
+msgstr "Vui lòng tải lại trang."
 
 #: js/update.js:17
 msgid ""
@@ -452,9 +465,15 @@ msgstr "Cập nhật không thành công . Vui lòng thông báo đến <a href=
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud."
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
+msgstr "%s thiết lập lại mật khẩu"
+
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
 msgstr ""
 
 #: lostpassword/templates/email.php:2
@@ -476,8 +495,8 @@ msgstr "Yêu cầu thất bại!<br>Bạn có chắc là email/tên đăng nhậ
 msgid "You will receive a link to reset your password via Email."
 msgstr "Vui lòng kiểm tra Email để khôi phục lại mật khẩu."
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "Tên đăng nhập"
 
@@ -487,15 +506,15 @@ msgid ""
 "will be no way to get your data back after your password is reset. If you "
 "are not sure what to do, please contact your administrator before you "
 "continue. Do you really want to continue?"
-msgstr ""
+msgstr "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?"
 
 #: lostpassword/templates/lostpassword.php:27
 msgid "Yes, I really want to reset my password now"
-msgstr ""
+msgstr "Vâng, tôi muốn thiết lập lại mật khẩu ngay."
 
 #: lostpassword/templates/lostpassword.php:30
 msgid "Reset"
-msgstr ""
+msgstr "Khởi động lại"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
@@ -513,6 +532,18 @@ msgstr "Mật khẩu mới"
 msgid "Reset password"
 msgstr "Khôi phục mật khẩu"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "Cá nhân"
@@ -521,7 +552,7 @@ msgstr "Cá nhân"
 msgid "Users"
 msgstr "Người dùng"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "Ứng dụng"
 
@@ -535,23 +566,23 @@ msgstr "Giúp đỡ"
 
 #: tags/controller.php:22
 msgid "Error loading tags"
-msgstr ""
+msgstr "Lỗi khi tải thẻ"
 
 #: tags/controller.php:48
 msgid "Tag already exists"
-msgstr ""
+msgstr "Thẻ đã tồn tại"
 
 #: tags/controller.php:64
 msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "Lỗi khi xóa (nhiều)thẻ"
 
 #: tags/controller.php:75
 msgid "Error tagging"
-msgstr ""
+msgstr "Lỗi gắn thẻ"
 
 #: tags/controller.php:86
 msgid "Error untagging"
-msgstr ""
+msgstr "Lỗi không gắn thẻ"
 
 #: tags/controller.php:97
 msgid "Error favoriting"
@@ -577,16 +608,16 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "Xin chào,\n\nbáo cho bạn biết rằng %s đã chia sẽ %s với bạn.\nXem nó: %s\n\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s."
-msgstr ""
+msgstr "Chia sẻ này sẽ hết hiệu lực vào %s."
 
 #: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
-msgstr ""
+msgstr "Chúc mừng!"
 
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
@@ -600,7 +631,7 @@ msgstr "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-
 #: templates/installation.php:27
 #, php-format
 msgid "Please update your PHP installation to use %s securely."
-msgstr ""
+msgstr "Vui lòng cập nhật bản cài đặt PHP để sử dụng %s một cách an toàn."
 
 #: templates/installation.php:33
 msgid ""
@@ -625,71 +656,69 @@ msgstr "Thư mục và file dữ liệu của bạn có thể được truy cậ
 msgid ""
 "For information how to properly configure your server, please see the <a "
 "href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
+msgstr "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>."
 
 #: templates/installation.php:48
 msgid "Create an <strong>admin account</strong>"
 msgstr "Tạo một <strong>tài khoản quản trị</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "Nâng cao"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "Thư mục dữ liệu"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "Cấu hình cơ sở dữ liệu"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "được sử dụng"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "Người dùng cơ sở dữ liệu"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "Mật khẩu cơ sở dữ liệu"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "Tên cơ sở dữ liệu"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "Cơ sở dữ liệu tablespace"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "Cài đặt hoàn tất"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
-msgstr ""
+msgstr "Đang hoàn thành ..."
 
 #: templates/layout.user.php:40
 msgid ""
 "This application requires JavaScript to be enabled for correct operation.  "
 "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
 "JavaScript</a> and re-load this interface."
-msgstr ""
+msgstr "Ứng dụng này yêu cầu JavaScript để hoạt động. Vui lòng <a href=\"http://enable-javascript.com/\" target=\"_blank\">kích hoạt JavaScript</a> và tải lại giao diện này."
 
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s còn trống. Xem thêm thông tin cách cập nhật."
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "Đăng xuất"
 
@@ -709,52 +738,52 @@ msgstr "Vui lòng thay đổi mật khẩu của bạn để đảm bảo tài k
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
-msgstr ""
+msgstr "Xác thực phía máy chủ không thành công!"
 
 #: templates/login.php:18
 msgid "Please contact your administrator."
-msgstr ""
+msgstr "Vui lòng liên hệ với quản trị viên."
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "Bạn quên mật khẩu ?"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "ghi nhớ"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "Đăng nhập"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "Đăng nhập khác"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
-msgstr ""
+msgstr "OwnCloud trong trường hợp này đang ở chế độ người dùng duy nhất."
 
 #: templates/singleuser.user.php:4
 msgid "This means only administrators can use the instance."
-msgstr ""
+msgstr "Điều này có nghĩa chỉ có người quản trị có thể sử dụng trong trường hợp này."
 
 #: templates/singleuser.user.php:5 templates/update.user.php:5
 msgid ""
 "Contact your system administrator if this message persists or appeared "
 "unexpectedly."
-msgstr ""
+msgstr "Liên hệ với người quản trị nếu lỗi này vẫn tồn tại hoặc xuất hiện bất ngờ."
 
 #: templates/singleuser.user.php:7 templates/update.user.php:6
 msgid "Thank you for your patience."
-msgstr ""
+msgstr "Cảm ơn sự kiên nhẫn của bạn."
 
 #: templates/update.admin.php:3
 #, php-format
@@ -764,8 +793,8 @@ msgstr "Cập nhật ownCloud lên phiên bản %s, có thể sẽ mất thời
 #: templates/update.user.php:3
 msgid ""
 "This ownCloud instance is currently being updated, which may take a while."
-msgstr ""
+msgstr "Phiên bản ownCloud này hiện đang được cập nhật, có thể sẽ mất một ít thời gian."
 
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
-msgstr ""
+msgstr "Xin vui lòng tải lại trang này để tiếp tục sử dụng ownCloud."
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 992a497b72..b049eef635 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -3,14 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Nguyễn Tài <mattheu.9x@gmail.com>, 2014
+# namphongbody <tunglam062000@gmail.com>, 2014
+# Sơn Nguyễn <sonnghit@gmail.com>, 2014
 # xtdv <truong.tx8@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,280 +21,287 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "Không thể di chuyển %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "Tên file không được rỗng"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:63
 #, php-format
-msgid ""
-"The name %s is already used in the folder %s. Please choose a different "
-"name."
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:81
-msgid "Not a valid source"
-msgstr ""
-
-#: ajax/newfile.php:86
-msgid ""
-"Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
-
-#: ajax/newfile.php:103
-#, php-format
-msgid "Error while downloading %s to %s"
-msgstr ""
-
-#: ajax/newfile.php:140
-msgid "Error when creating the file"
-msgstr ""
-
-#: ajax/newfolder.php:21
-msgid "Folder name cannot be empty."
-msgstr ""
-
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
-msgid "Error when creating the folder"
-msgstr ""
-
-#: ajax/upload.php:18 ajax/upload.php:50
-msgid "Unable to set upload directory."
-msgstr ""
-
-#: ajax/upload.php:27
-msgid "Invalid Token"
-msgstr ""
-
-#: ajax/upload.php:64
-msgid "No file was uploaded. Unknown error"
-msgstr "Không có tập tin nào được tải lên. Lỗi không xác định"
-
-#: ajax/upload.php:71
-msgid "There is no error, the file uploaded with success"
-msgstr "Không có lỗi, các tập tin đã được tải lên thành công"
-
-#: ajax/upload.php:72
-msgid ""
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-
-#: ajax/upload.php:74
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr "Tập tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML"
-
-#: ajax/upload.php:75
-msgid "The uploaded file was only partially uploaded"
-msgstr "Các tập tin được tải lên chỉ tải lên được một phần"
-
-#: ajax/upload.php:76
-msgid "No file was uploaded"
-msgstr "Chưa có file nào được tải lên"
-
-#: ajax/upload.php:77
-msgid "Missing a temporary folder"
-msgstr "Không tìm thấy thư mục tạm"
-
-#: ajax/upload.php:78
-msgid "Failed to write to disk"
-msgstr "Không thể ghi "
-
-#: ajax/upload.php:96
-msgid "Not enough storage available"
-msgstr "Không đủ không gian lưu trữ"
-
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
-msgid "Upload failed. Could not find uploaded file"
-msgstr ""
-
-#: ajax/upload.php:172
-msgid "Invalid directory."
-msgstr "Thư mục không hợp lệ"
-
-#: appinfo/app.php:11
-msgid "Files"
-msgstr "Tập tin"
-
-#: js/file-upload.js:228
-msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "Không đủ chỗ trống cần thiết"
-
-#: js/file-upload.js:306
-msgid "Upload cancelled."
-msgstr "Hủy tải lên"
-
-#: js/file-upload.js:344
-msgid "Could not get result from server."
-msgstr ""
-
-#: js/file-upload.js:436
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
-
-#: js/file-upload.js:523
-msgid "URL cannot be empty"
-msgstr ""
-
-#: js/file-upload.js:527 js/filelist.js:377
-msgid "In the home folder 'Shared' is a reserved filename"
-msgstr ""
-
-#: js/file-upload.js:529 js/filelist.js:379
-msgid "{new_name} already exists"
-msgstr "{new_name} đã tồn tại"
-
-#: js/file-upload.js:595
-msgid "Could not create file"
-msgstr ""
-
-#: js/file-upload.js:611
-msgid "Could not create folder"
-msgstr ""
-
-#: js/file-upload.js:661
-msgid "Error fetching URL"
-msgstr ""
-
-#: js/fileactions.js:125
-msgid "Share"
-msgstr "Chia sẻ"
-
-#: js/fileactions.js:137
-msgid "Delete permanently"
-msgstr "Xóa vĩnh vễn"
-
-#: js/fileactions.js:194
-msgid "Rename"
-msgstr "Sửa tên"
-
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
-msgid "Pending"
-msgstr "Đang chờ"
-
-#: js/filelist.js:405
-msgid "Could not rename file"
-msgstr ""
-
-#: js/filelist.js:539
-msgid "replaced {new_name} with {old_name}"
-msgstr "đã thay thế {new_name} bằng {old_name}"
-
-#: js/filelist.js:539
-msgid "undo"
-msgstr "lùi lại"
-
-#: js/filelist.js:591
-msgid "Error deleting file."
-msgstr ""
-
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-
-#: js/filelist.js:617
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:828 js/filelist.js:866
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
-msgstr[0] ""
-
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' là một tên file không hợp lệ"
-
-#: js/files.js:81
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng."
 
-#: js/files.js:93
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr "Tên %s đã được sử dụng trong thư mục %s. Hãy chọn tên khác."
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr "Nguồn không hợp lệ"
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr "Server cấm mở URLs, vui lòng kiểm tra lại cấu hình server"
+
+#: ajax/newfile.php:119
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr "Lỗi trong trong quá trình tải %s từ %s"
+
+#: ajax/newfile.php:156
+msgid "Error when creating the file"
+msgstr "Lỗi khi tạo file"
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr "Tên thư mục không thể để trống"
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr "Lỗi khi tạo thư mục"
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr "Không thể thiết lập thư mục tải lên."
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr "Xác thực không hợp lệ"
+
+#: ajax/upload.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr "Không có tập tin nào được tải lên. Lỗi không xác định"
+
+#: ajax/upload.php:78
+msgid "There is no error, the file uploaded with success"
+msgstr "Không có lỗi, các tập tin đã được tải lên thành công"
+
+#: ajax/upload.php:79
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+
+#: ajax/upload.php:81
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "Tập tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML"
+
+#: ajax/upload.php:82
+msgid "The uploaded file was only partially uploaded"
+msgstr "Các tập tin được tải lên chỉ tải lên được một phần"
+
+#: ajax/upload.php:83
+msgid "No file was uploaded"
+msgstr "Chưa có file nào được tải lên"
+
+#: ajax/upload.php:84
+msgid "Missing a temporary folder"
+msgstr "Không tìm thấy thư mục tạm"
+
+#: ajax/upload.php:85
+msgid "Failed to write to disk"
+msgstr "Không thể ghi "
+
+#: ajax/upload.php:103
+msgid "Not enough storage available"
+msgstr "Không đủ không gian lưu trữ"
+
+#: ajax/upload.php:160
+msgid "Upload failed. Could not find uploaded file"
+msgstr "Tải lên thất bại. Không thể tìm thấy tập tin được tải lên"
+
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "Tải lên thất bại. Không thể có được thông tin tập tin."
+
+#: ajax/upload.php:189
+msgid "Invalid directory."
+msgstr "Thư mục không hợp lệ"
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr "Tập tin"
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte"
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
+msgid "Upload cancelled."
+msgstr "Hủy tải lên"
+
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr "Không thể nhận được kết quả từ máy chủ."
+
+#: js/file-upload.js:477
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
+
+#: js/file-upload.js:564
+msgid "URL cannot be empty"
+msgstr "URL không thể để trống"
+
+#: js/file-upload.js:568
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr ""
+
+#: js/file-upload.js:570 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr "{new_name} đã tồn tại"
+
+#: js/file-upload.js:636
+msgid "Could not create file"
+msgstr "Không thể tạo file"
+
+#: js/file-upload.js:652
+msgid "Could not create folder"
+msgstr "Không thể tạo thư mục"
+
+#: js/file-upload.js:702
+msgid "Error fetching URL"
+msgstr ""
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr "Chia sẻ"
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr "Xóa vĩnh vễn"
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr "Sửa tên"
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr "Đang chờ"
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr "Không thể đổi tên file"
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr "đã thay thế {new_name} bằng {old_name}"
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr "lùi lại"
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr "Lỗi xóa file,"
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n thư mục"
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n tập tin"
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr "{dirs} và {files}"
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "Đang tải lên %n tập tin"
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "Your storage is full, files can not be updated or synced anymore!"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "Your storage is almost full ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "Ứng dụng mã hóa đã được kích hoạt nhưng bạn chưa khởi tạo khóa. Vui lòng đăng xuất ra và đăng nhập lại"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr ""
+msgstr "Mã hóa đã bị vô hiệu nhưng những tập tin của bạn vẫn được mã hóa. Vui lòng vào phần thiết lập cá nhân để giải mã chúng."
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "Your download is being prepared. This might take some time if the files are big."
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
-msgstr ""
+msgstr "Lỗi di chuyển tập tin"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "Lỗi"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "Tên"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "Thay đổi"
 
@@ -299,12 +309,12 @@ msgstr "Thay đổi"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
-msgstr ""
+msgstr "%s không thể đổi tên"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "Tải lên"
 
@@ -340,72 +350,68 @@ msgstr "Kích thước tối đa cho các tập tin ZIP"
 msgid "Save"
 msgstr "Lưu"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
-msgstr "Mới"
+msgstr "Tạo mới"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
-msgstr ""
+msgstr "File text mới"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "Tập tin văn bản"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "Tạo thư mục"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "Thư mục"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "Từ liên kết"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "File đã bị xóa"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "Hủy upload"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "Bạn không có quyền upload hoặc tạo files ở đây"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "Tải về"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "Tập tin tải lên quá lớn"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Các tập tin bạn đang tải lên vượt quá kích thước tối đa cho phép trên máy chủ ."
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "Tập tin đang được quét ,vui lòng chờ."
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "Hiện tại đang quét"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "Đang nâng cấp bộ nhớ đệm cho tập tin hệ thống..."
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index e6960f65bb..9494193386 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Tuấn Kiệt Hồ <hotuankiet_2000@yahoo.com>, 2013
+# Nguyễn Tài <mattheu.9x@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,21 +21,21 @@ msgstr ""
 
 #: ajax/adminrecovery.php:29
 msgid "Recovery key successfully enabled"
-msgstr ""
+msgstr "Khóa khôi phục kích hoạt thành công"
 
 #: ajax/adminrecovery.php:34
 msgid ""
 "Could not enable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!"
 
 #: ajax/adminrecovery.php:48
 msgid "Recovery key successfully disabled"
-msgstr ""
+msgstr "Vô hiệu hóa khóa khôi phục thành công"
 
 #: ajax/adminrecovery.php:53
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
+msgstr "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!"
 
 #: ajax/changeRecoveryPassword.php:49
 msgid "Password successfully changed."
@@ -46,13 +47,13 @@ msgstr "Không thể đổi mật khẩu. Có lẽ do mật khẩu cũ không đ
 
 #: ajax/updatePrivateKeyPassword.php:52
 msgid "Private key password successfully updated."
-msgstr ""
+msgstr "Cập nhật thành công mật khẩu khóa cá nhân"
 
 #: ajax/updatePrivateKeyPassword.php:54
 msgid ""
 "Could not update the private key password. Maybe the old password was not "
 "correct."
-msgstr ""
+msgstr "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng"
 
 #: files/error.php:12
 msgid ""
@@ -81,18 +82,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -100,9 +101,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "Đang lưu..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
@@ -110,7 +111,7 @@ msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "personal settings"
-msgstr ""
+msgstr "Thiết lập cá nhân"
 
 #: templates/settings-admin.php:4 templates/settings-personal.php:3
 msgid "Encryption"
@@ -159,44 +160,44 @@ msgstr "Đổi Mật khẩu"
 
 #: templates/settings-personal.php:9
 msgid "Your private key password no longer match your log-in password:"
-msgstr ""
+msgstr "Mật khẩu khóa cá nhân không còn phù hợp với mật khẩu đăng nhập:"
 
 #: templates/settings-personal.php:12
 msgid "Set your old private key password to your current log-in password."
-msgstr ""
+msgstr "Thiết lập mật khẩu khóa cá nhân cũ đến mật khẩu đăng nhập hiện tại."
 
 #: templates/settings-personal.php:14
 msgid ""
 " If you don't remember your old password you can ask your administrator to "
 "recover your files."
-msgstr ""
+msgstr "Nếu bạn không nhớ mật khẩu cũ, bạn có thể yêu cầu quản trị viên khôi phục tập tin của bạn."
 
 #: templates/settings-personal.php:22
 msgid "Old log-in password"
-msgstr ""
+msgstr "Mật khẩu đăng nhập cũ"
 
 #: templates/settings-personal.php:28
 msgid "Current log-in password"
-msgstr ""
+msgstr "Mật khẩu đăng nhập hiện tại"
 
 #: templates/settings-personal.php:33
 msgid "Update Private Key Password"
-msgstr ""
+msgstr "Cập nhật mật khẩu khóa cá nhân"
 
 #: templates/settings-personal.php:42
 msgid "Enable password recovery:"
-msgstr ""
+msgstr "Kích hoạt khôi phục mật khẩu:"
 
 #: templates/settings-personal.php:44
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
-msgstr ""
+msgstr "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu"
 
 #: templates/settings-personal.php:60
 msgid "File recovery settings updated"
-msgstr ""
+msgstr "Đã cập nhật thiết lập khôi phục tập tin "
 
 #: templates/settings-personal.php:61
 msgid "Could not update file recovery"
-msgstr ""
+msgstr "Không thể cập nhật khôi phục tập tin"
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index fed63a6861..983d24f383 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: xtdv <truong.tx8@gmail.com>\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "Đã cấp quyền truy cập"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "Lỗi cấu hình lưu trữ Dropbox "
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "Cấp quyền truy cập"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật."
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "Lỗi cấu hình lưu trữ Google Drive"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>Cảnh báo:</b> \"smbclient\" chưa được cài đặt. Mount CIFS/SMB shares là không thể thực hiện được. Hãy hỏi người quản trị hệ thống để cài đặt nó."
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>Cảnh báo:</b> FTP trong PHP chưa được cài đặt hoặc chưa được  mở. Mount FTP shares là không thể. Xin hãy yêu cầu quản trị hệ thống của bạn cài đặt nó."
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "Người dùng"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "Kích hoạt tính năng lưu trữ ngoài"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài của họ"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "Chứng chỉ SSL root"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "Nhập Root Certificate"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index b89ea054cf..5d4a83da3b 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "Được chia sẽ bởi {owner}"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s đã chia sẻ thư mục %s với bạn"
+msgid "shared by %s"
+msgstr " Được chia sẻ bởi %s"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s đã chia sẻ tập tin %s với bạn"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "Tải về"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "Tải lên"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "Hủy upload"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "Không có xem trước cho"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/vi/files_trashbin.po b/l10n/vi/files_trashbin.po
index 92e604b2a5..dca3fff20a 100644
--- a/l10n/vi/files_trashbin.po
+++ b/l10n/vi/files_trashbin.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +18,48 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
-msgstr "Không thể óa %s vĩnh viễn"
+msgstr "Không thể xóa %s vĩnh viễn"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "Không thể khôi phục %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "File đã bị xóa"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "Lỗi"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
-msgstr ""
+msgstr "khôi phục"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "Không có gì ở đây. Thùng rác của bạn rỗng!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "Tên"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "Khôi phục"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "Đã xóa"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "File đã xóa"
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index 502dfac96b..9de7752b07 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-01-18 04:20+0000\n"
+"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +23,22 @@ msgstr ""
 msgid "Could not revert: %s"
 msgstr "Không thể khôi phục: %s"
 
-#: js/versions.js:7
+#: js/versions.js:14
 msgid "Versions"
 msgstr "Phiên bản"
 
-#: js/versions.js:53
+#: js/versions.js:60
 msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "Thất bại khi trở lại {file} khi sử đổi {timestamp}."
 
-#: js/versions.js:79
+#: js/versions.js:87
 msgid "More versions..."
-msgstr ""
+msgstr "Nhiều phiên bản ..."
 
-#: js/versions.js:116
+#: js/versions.js:125
 msgid "No other versions available"
-msgstr ""
+msgstr "Không có các phiên bản khác có sẵn"
 
-#: js/versions.js:149
+#: js/versions.js:155
 msgid "Restore"
 msgstr "Khôi phục"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index b91c21cfaa..256526134a 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,59 +17,54 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "Giúp đỡ"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "Cá nhân"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "Người dùng"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "Quản trị"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
 
 #: private/avatar.php:66
 msgid "Unknown filetype"
-msgstr ""
+msgstr "Không biết kiểu tập tin"
 
 #: private/avatar.php:71
 msgid "Invalid image"
-msgstr ""
+msgstr "Hình ảnh không hợp lệ"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "dịch vụ web dưới sự kiểm soát của bạn"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "Tải về ZIP đã bị tắt."
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "Ứng dụng không được BẬT"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "Lỗi xác thực"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Mã Token đã hết hạn. Hãy tải lại trang."
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "Tập tin"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,62 +267,68 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s đã chia sẻ »%s« với bạn"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "không thể tìm thấy mục \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "vài giây trước"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
-msgstr[0] ""
+msgstr[0] "%n phút trước"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
-msgstr[0] ""
+msgstr[0] "%n giờ trước"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "hôm nay"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "hôm qua"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
-msgstr[0] ""
+msgstr[0] "%n ngày trước"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "tháng trước"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
-msgstr[0] ""
+msgstr[0] "%n tháng trước"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "năm trước"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "năm trước"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 53de10b99c..fb28962850 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Sơn Nguyễn <sonnghit@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +18,48 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email đã được gửi"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "Mã hóa"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Không thể tải danh sách ứng dụng từ App Store"
@@ -28,11 +71,11 @@ msgstr "Lỗi xác thực"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
-msgstr ""
+msgstr "Họ và tên đã được thay đổi."
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change full name"
-msgstr ""
+msgstr "Họ và tên không thể đổi "
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -113,61 +156,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "Tài liệu người sử dụng"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "Cập nhật lên {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "Tắt"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "Bật"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "Xin hãy đợi..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "Đang cập nhật..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "Lỗi khi cập nhật ứng dụng"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "Lỗi"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "Cập nhật"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "Đã cập nhật"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "Đang lưu..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
+msgstr ""
 
 #: js/users.js:47
 msgid "deleted"
@@ -179,42 +250,42 @@ msgstr "lùi lại"
 
 #: js/users.js:79
 msgid "Unable to remove user"
-msgstr ""
+msgstr "Không thể xóa người "
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "Nhóm"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "Nhóm quản trị"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "Xóa"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__Ngôn ngữ___"
 
@@ -238,88 +309,112 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "Không gì cả"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "Đăng nhập"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "Cảnh bảo bảo mật"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
 "configure your webserver in a way that the data directory is no longer "
 "accessible or you move the data directory outside the webserver document "
 "root."
-msgstr ""
+msgstr "Thư mục và các tập tin của bạn có thể được truy cập từ Internet. Tập tin .htaccess không làm việc. Chúng tôi đề nghị bạn cấu hình ebserver ,phân quyền lại thư mục dữ liệu và cấp quyền truy cập hoặc di chuyển thư mục dữ liệu bên ngoài tài liệu gốc máy chủ web."
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "Thực thi tác vụ mỗi khi trang được tải"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "Chia sẻ"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "Bật chia sẻ API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "Cho phép các ứng dụng sử dụng chia sẻ API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "Cho phép liên kết"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "Cho phép chia sẻ lại"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "Cho phép người dùng chia sẻ với bất cứ ai"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "Địa chỉ máy chủ"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "Cổng"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "Giấy chứng nhận"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "hơn"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "ít"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "Phiên bản"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,30 +604,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "Thêm ứng dụng của bạn"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "Nhiều ứng dụng hơn"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "Chọn một ứng dụng"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "Xem nhiều ứng dụng hơn tại apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "Tài liệu người sử dụng"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "Tài liệu quản trị"
@@ -506,7 +665,7 @@ msgstr "Hiện lại việc chạy đồ thuật khởi đầu"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "Mật khẩu"
 
@@ -518,151 +677,149 @@ msgstr "Mật khẩu của bạn đã được thay đổi."
 msgid "Unable to change your password"
 msgstr "Không thể đổi mật khẩu"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "Mật khẩu cũ"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "Mật khẩu mới"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "Đổi mật khẩu"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
-msgstr ""
+msgstr "Họ và tên"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "Email"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "Email của bạn"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
-msgstr ""
+msgstr "Tải lên"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
-msgstr ""
+msgstr "Xóa "
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "Hủy"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
-msgstr ""
+msgstr "Chọn hình ảnh như hồ sơ cá nhân"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "Hỗ trợ dịch thuật"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "Mã hóa"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "Tên đăng nhập"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "Tạo"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "Bộ nhớ mặc định"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "Không giới hạn"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "Khác"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "Tên đăng nhập"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "Bộ nhớ"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
-msgstr ""
+msgstr "Đổi họ và t"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "đặt mật khẩu mới"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "Mặc định"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index a5bce417eb..0874d51ffb 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "Thành công"
 msgid "Error"
 msgstr "Lỗi"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "Chọn nhóm"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr "Giúp đỡ"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr "Bạn có thể chỉ định DN cơ bản cho người dùng và các n
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -283,7 +283,7 @@ msgstr "Trở lại"
 
 #: templates/part.wizardcontrols.php:8
 msgid "Continue"
-msgstr ""
+msgstr "Tiếp tục"
 
 #: templates/settings.php:11
 msgid ""
@@ -407,41 +407,51 @@ msgstr "Group Search Attributes"
 msgid "Group-Member association"
 msgstr "Nhóm thành viên Cộng đồng"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "Special Attributes"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "Theo Byte"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index a4491d6020..4303137877 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # saosangm <saosangmo@yahoo.com>, 2013
-# Sơn Nguyễn <sonnghit@gmail.com>, 2012
+# Sơn Nguyễn <sonnghit@gmail.com>, 2012,2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-27 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 05:57+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-01-21 08:20+0000\n"
+"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,11 +25,11 @@ msgstr "Xác thực WebDAV"
 
 #: templates/settings.php:4
 msgid "Address: "
-msgstr ""
+msgstr "Địa chỉ :"
 
 #: templates/settings.php:7
 msgid ""
 "The user credentials will be sent to this address. This plugin checks the "
 "response and will interpret the HTTP statuscodes 401 and 403 as invalid "
 "credentials, and all other responses as valid credentials."
-msgstr ""
+msgstr "Các thông tin người dùng sẽ được gửi đến địa chỉ này. Plugin này sẽ kiểm tra các phản hồi và các statuscodes HTTP 401 và 403 không hợp lệ, và tất cả những phản h khác như thông tin hợp lệ."
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index e5bde42b8b..0345cacc60 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -4,16 +4,17 @@
 # 
 # Translators:
 # hanfeng <appweb.cn@gmail.com>, 2013
+# smartree <smartree@gmail.com>, 2014
 # Xuetian Weng <wengxt@gmail.com>, 2013
-# zhangmin <zm1990s@gmail.com>, 2013
-# zhangmin <zm1990s@gmail.com>, 2013
+# min zhang <zm1990s@gmail.com>, 2013
+# min zhang <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,15 +22,14 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s 向您分享了 »%s«"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
-msgstr ""
+msgstr "发送失败，用户如下: %s "
 
 #: ajax/update.php:11
 msgid "Turned on maintenance mode"
@@ -43,22 +43,9 @@ msgstr "关闭维护模式"
 msgid "Updated database"
 msgstr "数据库已更新"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "正在更新文件缓存，这可能需要较长时间..."
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "文件缓存已更新"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "...已完成 %d%% ..."
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
-msgstr ""
+msgstr "没有提供图片或文件"
 
 #: avatar/controller.php:81
 msgid "Unknown filetype"
@@ -70,137 +57,141 @@ msgstr "无效的图像"
 
 #: avatar/controller.php:115 avatar/controller.php:142
 msgid "No temporary profile picture available, try again"
-msgstr ""
+msgstr "没有临时概览页图片可用，请重试"
 
 #: avatar/controller.php:135
 msgid "No crop data provided"
-msgstr ""
+msgstr "没有提供相应数据"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "星期日"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "星期一"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "星期二"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "星期三"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "星期四"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "星期五"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "星期六"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "保存中"
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟前"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小时前"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "上月"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月前"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "年前"
 
@@ -210,7 +201,7 @@ msgstr "选择(&C)..."
 
 #: js/oc-dialogs.js:146
 msgid "Error loading file picker template: {error}"
-msgstr ""
+msgstr "加载文件分拣模板出错: {error}"
 
 #: js/oc-dialogs.js:172
 msgid "Yes"
@@ -226,26 +217,26 @@ msgstr "好"
 
 #: js/oc-dialogs.js:219
 msgid "Error loading message template: {error}"
-msgstr ""
+msgstr "加载消息模板出错: {error}"
 
 #: js/oc-dialogs.js:347
 msgid "{count} file conflict"
 msgid_plural "{count} file conflicts"
-msgstr[0] ""
+msgstr[0] "{count} 个文件冲突"
 
 #: js/oc-dialogs.js:361
 msgid "One file conflict"
-msgstr ""
+msgstr "1个文件冲突"
 
 #: js/oc-dialogs.js:367
 msgid "Which files do you want to keep?"
-msgstr ""
+msgstr "想要保留哪一个文件呢？"
 
 #: js/oc-dialogs.js:368
 msgid ""
 "If you select both versions, the copied file will have a number added to its"
 " name."
-msgstr ""
+msgstr "如果同时选择了连个版本，复制的文件名将会添加上一个数字。"
 
 #: js/oc-dialogs.js:376
 msgid "Cancel"
@@ -253,18 +244,38 @@ msgstr "取消"
 
 #: js/oc-dialogs.js:386
 msgid "Continue"
-msgstr ""
+msgstr "继续"
 
 #: js/oc-dialogs.js:433 js/oc-dialogs.js:446
 msgid "(all selected)"
-msgstr ""
+msgstr "(选中全部)"
 
 #: js/oc-dialogs.js:436 js/oc-dialogs.js:449
 msgid "({count} selected)"
-msgstr ""
+msgstr "(选择了{count}个)"
 
 #: js/oc-dialogs.js:457
 msgid "Error loading file exists template"
+msgstr "加载文件存在性模板失败"
+
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
 msgstr ""
 
 #: js/share.js:51 js/share.js:66 js/share.js:106
@@ -275,12 +286,12 @@ msgstr "已共享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "错误"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "共享时出错"
 
@@ -292,123 +303,123 @@ msgstr "取消共享时出错"
 msgid "Error while changing permissions"
 msgstr "修改权限时出错"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} 共享给您及 {group} 组"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner} 与您共享"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
-msgstr ""
+msgstr "分享给其他用户或组 ..."
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
-msgstr ""
+msgstr "分享链接"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "密码保护"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "密码"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "允许公开上传"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "发送链接到个人"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "发送"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "设置过期日期"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "组"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "在 {item} 与 {user} 共享。"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
-msgstr ""
+msgstr "以邮件通知"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "可以修改"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "正在发送..."
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "邮件已发送"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "警告"
 
@@ -418,7 +429,7 @@ msgstr "未指定对象类型。"
 
 #: js/tags.js:13
 msgid "Enter new"
-msgstr ""
+msgstr "输入新..."
 
 #: js/tags.js:27
 msgid "Delete"
@@ -430,19 +441,19 @@ msgstr "增加"
 
 #: js/tags.js:39
 msgid "Edit tags"
-msgstr ""
+msgstr "编辑标签"
 
 #: js/tags.js:57
 msgid "Error loading dialog template: {error}"
-msgstr ""
+msgstr "加载对话框模板出错: {error}"
 
 #: js/tags.js:261
 msgid "No tags selected for deletion."
-msgstr ""
+msgstr "请选择要删除的标签。"
 
 #: js/update.js:8
 msgid "Please reload the page."
-msgstr ""
+msgstr "请重新加载页面。"
 
 #: js/update.js:17
 msgid ""
@@ -455,11 +466,17 @@ msgstr "更新不成功。请汇报将此问题汇报给  <a href=\"https://gith
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新成功。正在重定向至 ownCloud。"
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "重置 %s 的密码"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "使用以下链接重置您的密码：{link}"
@@ -479,8 +496,8 @@ msgstr "请求失败<br>您确定您的邮箱/用户名是正确的？"
 msgid "You will receive a link to reset your password via Email."
 msgstr "您将会收到包含可以重置密码链接的邮件。"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "用户名"
 
@@ -516,6 +533,18 @@ msgstr "新密码"
 msgid "Reset password"
 msgstr "重置密码"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "个人"
@@ -524,7 +553,7 @@ msgstr "个人"
 msgid "Users"
 msgstr "用户"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "应用"
 
@@ -538,31 +567,31 @@ msgstr "帮助"
 
 #: tags/controller.php:22
 msgid "Error loading tags"
-msgstr ""
+msgstr "加载标签出错"
 
 #: tags/controller.php:48
 msgid "Tag already exists"
-msgstr ""
+msgstr "标签已存在"
 
 #: tags/controller.php:64
 msgid "Error deleting tag(s)"
-msgstr ""
+msgstr "删除标签(s)时出错"
 
 #: tags/controller.php:75
 msgid "Error tagging"
-msgstr ""
+msgstr "添加标签时出错"
 
 #: tags/controller.php:86
 msgid "Error untagging"
-msgstr ""
+msgstr "移除标签时出错"
 
 #: tags/controller.php:97
 msgid "Error favoriting"
-msgstr ""
+msgstr "收藏时出错"
 
 #: tags/controller.php:108
 msgid "Error unfavoriting"
-msgstr ""
+msgstr "删除收藏时出错"
 
 #: templates/403.php:12
 msgid "Access forbidden"
@@ -580,16 +609,16 @@ msgid ""
 "just letting you know that %s shared %s with you.\n"
 "View it: %s\n"
 "\n"
-msgstr ""
+msgstr "嗨、你好,\n\n只想让你知道 %s 分享了 %s 给你。\n现在查看: %s\n"
 
 #: templates/altmail.php:4 templates/mail.php:17
 #, php-format
 msgid "The share will expire on %s."
-msgstr ""
+msgstr "此分享将在 %s 过期。"
 
 #: templates/altmail.php:7 templates/mail.php:20
 msgid "Cheers!"
-msgstr ""
+msgstr "干杯！"
 
 #: templates/installation.php:25 templates/installation.php:32
 #: templates/installation.php:39
@@ -634,65 +663,63 @@ msgstr "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\"
 msgid "Create an <strong>admin account</strong>"
 msgstr "创建<strong>管理员账号</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "高级"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "数据目录"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "将被使用"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "数据库名"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "数据库表空间"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "安装完成"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
-msgstr ""
+msgstr "正在结束 ..."
 
 #: templates/layout.user.php:40
 msgid ""
 "This application requires JavaScript to be enabled for correct operation.  "
 "Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable "
 "JavaScript</a> and re-load this interface."
-msgstr ""
+msgstr "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此接口。"
 
 #: templates/layout.user.php:44
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 可用。获取更多关于如何升级的信息。"
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "注销"
 
@@ -712,52 +739,52 @@ msgstr "请修改您的密码，以保护您的账户安全。"
 
 #: templates/login.php:17
 msgid "Server side authentication failed!"
-msgstr ""
+msgstr "服务端验证失败！"
 
 #: templates/login.php:18
 msgid "Please contact your administrator."
-msgstr ""
+msgstr "请联系你的管理员。"
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "忘记密码？"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "记住"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "登录"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "其他登录方式"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
-msgstr ""
+msgstr "当前ownCloud实例运行在单用户模式下。"
 
 #: templates/singleuser.user.php:4
 msgid "This means only administrators can use the instance."
-msgstr ""
+msgstr "这意味着只有管理员才能在实例上操作。"
 
 #: templates/singleuser.user.php:5 templates/update.user.php:5
 msgid ""
 "Contact your system administrator if this message persists or appeared "
 "unexpectedly."
-msgstr ""
+msgstr "如果这个消息一直存在或不停出现，请联系你的系统管理员。"
 
 #: templates/singleuser.user.php:7 templates/update.user.php:6
 msgid "Thank you for your patience."
-msgstr ""
+msgstr "感谢让你久等了。"
 
 #: templates/update.admin.php:3
 #, php-format
@@ -767,8 +794,8 @@ msgstr "更新 ownCloud 到版本 %s，这可能需要一些时间。"
 #: templates/update.user.php:3
 msgid ""
 "This ownCloud instance is currently being updated, which may take a while."
-msgstr ""
+msgstr "当前ownCloud实例正在更新，可能需要一段时间。"
 
 #: templates/update.user.php:4
 msgid "Please reload this page after a short time to continue using ownCloud."
-msgstr ""
+msgstr "请稍后重新加载这个页面，以继续使用ownCloud。"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 102239c828..79cc25eb3e 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin Liu <liuzh66@gmail.com>, 2014
 # Mengz You <mengz.you@gmail.com>, 2013
-# zhangmin <zm1990s@gmail.com>, 2013
-# zhangmin <zm1990s@gmail.com>, 2013
+# min zhang <zm1990s@gmail.com>, 2013
+# min zhang <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,293 +21,300 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "无法移动 %s - 同名文件已存在"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "无法移动 %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "文件名不能为空。"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:63
 #, php-format
-msgid ""
-"The name %s is already used in the folder %s. Please choose a different "
-"name."
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:81
-msgid "Not a valid source"
-msgstr ""
-
-#: ajax/newfile.php:86
-msgid ""
-"Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
-
-#: ajax/newfile.php:103
-#, php-format
-msgid "Error while downloading %s to %s"
-msgstr ""
-
-#: ajax/newfile.php:140
-msgid "Error when creating the file"
-msgstr ""
-
-#: ajax/newfolder.php:21
-msgid "Folder name cannot be empty."
-msgstr ""
-
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
-msgid "Error when creating the folder"
-msgstr ""
-
-#: ajax/upload.php:18 ajax/upload.php:50
-msgid "Unable to set upload directory."
-msgstr "无法设置上传文件夹。"
-
-#: ajax/upload.php:27
-msgid "Invalid Token"
-msgstr "无效密匙"
-
-#: ajax/upload.php:64
-msgid "No file was uploaded. Unknown error"
-msgstr "没有文件被上传。未知错误"
-
-#: ajax/upload.php:71
-msgid "There is no error, the file uploaded with success"
-msgstr "文件上传成功，没有错误发生"
-
-#: ajax/upload.php:72
-msgid ""
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr "上传文件大小已超过php.ini中upload_max_filesize所规定的值"
-
-#: ajax/upload.php:74
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制"
-
-#: ajax/upload.php:75
-msgid "The uploaded file was only partially uploaded"
-msgstr "已上传文件只上传了部分（不完整）"
-
-#: ajax/upload.php:76
-msgid "No file was uploaded"
-msgstr "没有文件被上传"
-
-#: ajax/upload.php:77
-msgid "Missing a temporary folder"
-msgstr "缺少临时目录"
-
-#: ajax/upload.php:78
-msgid "Failed to write to disk"
-msgstr "写入磁盘失败"
-
-#: ajax/upload.php:96
-msgid "Not enough storage available"
-msgstr "没有足够的存储空间"
-
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
-msgid "Upload failed. Could not find uploaded file"
-msgstr ""
-
-#: ajax/upload.php:172
-msgid "Invalid directory."
-msgstr "无效文件夹。"
-
-#: appinfo/app.php:11
-msgid "Files"
-msgstr "文件"
-
-#: js/file-upload.js:228
-msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "没有足够可用空间"
-
-#: js/file-upload.js:306
-msgid "Upload cancelled."
-msgstr "上传已取消"
-
-#: js/file-upload.js:344
-msgid "Could not get result from server."
-msgstr ""
-
-#: js/file-upload.js:436
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
-
-#: js/file-upload.js:523
-msgid "URL cannot be empty"
-msgstr ""
-
-#: js/file-upload.js:527 js/filelist.js:377
-msgid "In the home folder 'Shared' is a reserved filename"
-msgstr ""
-
-#: js/file-upload.js:529 js/filelist.js:379
-msgid "{new_name} already exists"
-msgstr "{new_name} 已存在"
-
-#: js/file-upload.js:595
-msgid "Could not create file"
-msgstr ""
-
-#: js/file-upload.js:611
-msgid "Could not create folder"
-msgstr ""
-
-#: js/file-upload.js:661
-msgid "Error fetching URL"
-msgstr ""
-
-#: js/fileactions.js:125
-msgid "Share"
-msgstr "分享"
-
-#: js/fileactions.js:137
-msgid "Delete permanently"
-msgstr "永久删除"
-
-#: js/fileactions.js:194
-msgid "Rename"
-msgstr "重命名"
-
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
-msgid "Pending"
-msgstr "等待"
-
-#: js/filelist.js:405
-msgid "Could not rename file"
-msgstr ""
-
-#: js/filelist.js:539
-msgid "replaced {new_name} with {old_name}"
-msgstr "已将 {old_name}替换成 {new_name}"
-
-#: js/filelist.js:539
-msgid "undo"
-msgstr "撤销"
-
-#: js/filelist.js:591
-msgid "Error deleting file."
-msgstr ""
-
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] "%n 文件夹"
-
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] "%n个文件"
-
-#: js/filelist.js:617
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: js/filelist.js:828 js/filelist.js:866
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
-msgstr[0] ""
-
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' 是一个无效的文件名。"
-
-#: js/files.js:81
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。"
 
-#: js/files.js:93
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
+#, php-format
+msgid ""
+"The name %s is already used in the folder %s. Please choose a different "
+"name."
+msgstr "文件名 %s 是已经在 %s 中存在的名称。请使用其他名称。"
+
+#: ajax/newfile.php:97
+msgid "Not a valid source"
+msgstr "不是一个可用的源"
+
+#: ajax/newfile.php:102
+msgid ""
+"Server is not allowed to open URLs, please check the server configuration"
+msgstr "服务器没有允许打开URL网址，请检查服务器配置"
+
+#: ajax/newfile.php:119
+#, php-format
+msgid "Error while downloading %s to %s"
+msgstr "当下载 %s 到 %s 时出错"
+
+#: ajax/newfile.php:156
+msgid "Error when creating the file"
+msgstr "当创建文件是出错"
+
+#: ajax/newfolder.php:22
+msgid "Folder name cannot be empty."
+msgstr "文件夹名称不能为空"
+
+#: ajax/newfolder.php:66
+msgid "Error when creating the folder"
+msgstr "创建文件夹出错"
+
+#: ajax/upload.php:19 ajax/upload.php:53
+msgid "Unable to set upload directory."
+msgstr "无法设置上传文件夹。"
+
+#: ajax/upload.php:29
+msgid "Invalid Token"
+msgstr "无效密匙"
+
+#: ajax/upload.php:71
+msgid "No file was uploaded. Unknown error"
+msgstr "没有文件被上传。未知错误"
+
+#: ajax/upload.php:78
+msgid "There is no error, the file uploaded with success"
+msgstr "文件上传成功，没有错误发生"
+
+#: ajax/upload.php:79
+msgid ""
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
+msgstr "上传文件大小已超过php.ini中upload_max_filesize所规定的值"
+
+#: ajax/upload.php:81
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制"
+
+#: ajax/upload.php:82
+msgid "The uploaded file was only partially uploaded"
+msgstr "已上传文件只上传了部分（不完整）"
+
+#: ajax/upload.php:83
+msgid "No file was uploaded"
+msgstr "没有文件被上传"
+
+#: ajax/upload.php:84
+msgid "Missing a temporary folder"
+msgstr "缺少临时目录"
+
+#: ajax/upload.php:85
+msgid "Failed to write to disk"
+msgstr "写入磁盘失败"
+
+#: ajax/upload.php:103
+msgid "Not enough storage available"
+msgstr "没有足够的存储空间"
+
+#: ajax/upload.php:160
+msgid "Upload failed. Could not find uploaded file"
+msgstr "上传失败。不能发现上传的文件"
+
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "上传失败。不能获取文件信息。"
+
+#: ajax/upload.php:189
+msgid "Invalid directory."
+msgstr "无效文件夹。"
+
+#: appinfo/app.php:11 js/filelist.js:14
+msgid "Files"
+msgstr "文件"
+
+#: js/file-upload.js:247
+msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
+msgstr "不能上传文件 {filename} ，由于它是一个目录或者为0字节"
+
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
+
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
+msgid "Upload cancelled."
+msgstr "上传已取消"
+
+#: js/file-upload.js:385
+msgid "Could not get result from server."
+msgstr "不能从服务器得到结果"
+
+#: js/file-upload.js:477
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
+
+#: js/file-upload.js:564
+msgid "URL cannot be empty"
+msgstr "URL不能为空"
+
+#: js/file-upload.js:568
+msgid "In the home folder 'Shared' is a reserved filename"
+msgstr "主目录里 'Shared' 是系统预留目录名"
+
+#: js/file-upload.js:570 js/filelist.js:430
+msgid "{new_name} already exists"
+msgstr "{new_name} 已存在"
+
+#: js/file-upload.js:636
+msgid "Could not create file"
+msgstr "不能创建文件"
+
+#: js/file-upload.js:652
+msgid "Could not create folder"
+msgstr "不能创建文件夹"
+
+#: js/file-upload.js:702
+msgid "Error fetching URL"
+msgstr "获取URL出错"
+
+#: js/fileactions.js:149
+msgid "Share"
+msgstr "分享"
+
+#: js/fileactions.js:162
+msgid "Delete permanently"
+msgstr "永久删除"
+
+#: js/fileactions.js:223
+msgid "Rename"
+msgstr "重命名"
+
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
+msgid "Pending"
+msgstr "等待"
+
+#: js/filelist.js:456
+msgid "Could not rename file"
+msgstr "不能重命名文件"
+
+#: js/filelist.js:591
+msgid "replaced {new_name} with {old_name}"
+msgstr "已将 {old_name}替换成 {new_name}"
+
+#: js/filelist.js:591
+msgid "undo"
+msgstr "撤销"
+
+#: js/filelist.js:662
+msgid "Error deleting file."
+msgstr "删除文件出错。"
+
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
+msgid "%n folder"
+msgid_plural "%n folders"
+msgstr[0] "%n 文件夹"
+
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
+msgid "%n file"
+msgid_plural "%n files"
+msgstr[0] "%n个文件"
+
+#: js/filelist.js:695
+msgid "{dirs} and {files}"
+msgstr "{dirs} 和 {files}"
+
+#: js/filelist.js:931 js/filelist.js:969
+msgid "Uploading %n file"
+msgid_plural "Uploading %n files"
+msgstr[0] "上传 %n 个文件"
+
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
+
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "您的存储空间已满，文件将无法更新或同步！"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的存储空间即将用完 ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
-msgstr ""
+msgstr "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
-msgstr ""
+msgstr "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。"
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
-msgstr ""
+msgstr "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。"
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "下载正在准备中。如果文件较大可能会花费一些时间。"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
-msgstr ""
+msgstr "移动文件错误"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "错误"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "名称"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "修改日期"
 
 #: lib/app.php:60
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
-msgstr ""
+msgstr "无效的文件夹名。”Shared“ 是 Owncloud 预留的文件夹"
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "%s 不能被重命名"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "上传"
 
@@ -342,72 +350,68 @@ msgstr "ZIP 文件的最大输入大小"
 msgid "Save"
 msgstr "保存"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "新建"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
-msgstr ""
+msgstr "创建文本文件"
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "文本文件"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "添加文件夹"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "文件夹"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "来自链接"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "已删除文件"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
-msgstr ""
+msgstr "您没有权限来上传湖州哦和创建文件"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧！"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "删除"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大容量限制"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描，请稍候。"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "当前扫描"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "正在更新文件系统缓存..."
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index bd66314a7c..ebd97ad4d8 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,18 +83,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -102,9 +102,9 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "保存中"
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index 935872a3fc..09e54dc720 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "权限已授予。"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "配置Dropbox存储时出错"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "授权"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "请提供有效的Dropbox应用key和secret"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "配置Google Drive存储时出错"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>警告：</b>“smbclient” 尚未安装。CIFS/SMB 分享挂载无法实现。请咨询系统管理员进行安装。"
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>警告：</b>PHP中尚未启用或安装FTP。FTP 分享挂载无法实现。请咨询系统管理员进行安装。"
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "用户"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "删除"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "启用用户外部存储"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "允许用户挂载自有外部存储"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL根证书"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "导入根证书"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 94907e444c..09d1b89e66 100644
--- a/l10n/zh_CN/files_sharing.po
+++ b/l10n/zh_CN/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin Liu <liuzh66@gmail.com>, 2014
 # waterone <suiy02@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,9 +19,13 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "由{owner}共享"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
-msgstr ""
+msgstr "这是一个密码保护的共享"
 
 #: templates/authenticate.php:7
 msgid "The password is wrong. Try again."
@@ -54,32 +59,16 @@ msgstr "共享已禁用"
 msgid "For more info, please ask the person who sent this link."
 msgstr "欲知详情，请联系发给你链接的人。"
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s与您共享了%s文件夹"
+msgid "shared by %s"
+msgstr "由 %s 共享"
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s与您共享了%s文件"
-
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "下载"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "上传"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "取消上传"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "没有预览"
-
-#: templates/public.php:99
-msgid "Direct link"
+msgid "Download %s"
 msgstr ""
+
+#: templates/public.php:48
+msgid "Direct link"
+msgstr "直接链接"
diff --git a/l10n/zh_CN/files_trashbin.po b/l10n/zh_CN/files_trashbin.po
index 07256e5e8c..8a27dc06d6 100644
--- a/l10n/zh_CN/files_trashbin.po
+++ b/l10n/zh_CN/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "无法彻底删除文件%s"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "无法恢复%s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "已删除文件"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "错误"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "已恢复"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "这里没有东西. 你的回收站是空的!"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "名称"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "恢复"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "已删除"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "删除"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "已删除文件"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index e94009a873..fa2d9750d7 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Hawy <hawy.hust@gmail.com>, 2014
+# Martin Liu <liuzh66@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-07-28 01:56-0400\n"
-"PO-Revision-Date: 2013-07-27 06:10+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-03-11 01:54-0400\n"
+"PO-Revision-Date: 2014-02-26 09:42+0000\n"
+"Last-Translator: Hawy <hawy.hust@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +24,22 @@ msgstr ""
 msgid "Could not revert: %s"
 msgstr "无法恢复: %s"
 
-#: js/versions.js:7
+#: js/versions.js:14
 msgid "Versions"
 msgstr "版本"
 
-#: js/versions.js:53
+#: js/versions.js:60
 msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
+msgstr "无法恢复 {file} 到 {timestamp} 的版本。"
 
-#: js/versions.js:79
+#: js/versions.js:87
 msgid "More versions..."
-msgstr ""
+msgstr "更多版本..."
 
-#: js/versions.js:116
+#: js/versions.js:125
 msgid "No other versions available"
-msgstr ""
+msgstr "无其他版本可用"
 
-#: js/versions.js:149
+#: js/versions.js:155
 msgid "Restore"
 msgstr "恢复"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 8dd911abea..6398312966 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -4,15 +4,17 @@
 # 
 # Translators:
 # Charlie Mak <makchamhim72@gmail.com>, 2013
+# peishi fang <fangpeishi@gmail.com>, 2014
+# Martin Liu <liuzh66@gmail.com>, 2014
 # modokwang <modokwang@gmail.com>, 2013
 # Xuetian Weng <wengxt@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,41 +22,41 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "帮助"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "个人"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "设置"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "用户"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "管理"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
-msgstr ""
+msgstr "\"%s\" 升级失败。"
 
 #: private/avatar.php:66
 msgid "Unknown filetype"
@@ -64,15 +66,10 @@ msgstr "未知的文件类型"
 msgid "Invalid image"
 msgstr "无效的图像"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "您控制的web服务"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP 下载已经关闭"
@@ -95,74 +92,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "应用未提供 info.xml 文件"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
-msgstr ""
+msgstr "应用程序目录已存在"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
+msgstr "无法创建应用程序文件夹。请修正权限。%s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "应用程序未启用"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "认证出错"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token 过期，请刷新页面。"
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "文件"
@@ -202,8 +203,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "你需要输入一个数据库中已有的账户或管理员账户。"
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL 数据库用户名和/或密码无效"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -230,21 +231,21 @@ msgstr "冲突命令为：\"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL 用户 '%s'@'localhost' 已存在。"
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL 用户 '%s'@'%%' 已存在"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "建议从 MySQL 数据库中丢弃 Drop 此用户。"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -271,62 +272,68 @@ msgstr "请设置一个管理员用户名。"
 msgid "Set an admin password."
 msgstr "请设置一个管理员密码。"
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "请认真检查<a href='%s'>安装指南</a>."
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s 向您分享了 »%s«"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "无法找到分类 \"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "秒前"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分钟前"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小时前"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "今天"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "昨天"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "上月"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 月前"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "去年"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "年前"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 75e9691e0d..34e1ff4df2 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,18 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin Liu <liuzh66@gmail.com>, 2014
+# mozillazg <opensource.mozillazg@gmail.com>, 2014
 # m13253 <m13253@hotmail.com>, 2013
 # waterone <suiy02@gmail.com>, 2013
 # modokwang <modokwang@gmail.com>, 2013
 # Xuetian Weng <wengxt@gmail.com>, 2013
-# zhangmin <zm1990s@gmail.com>, 2013
+# min zhang <zm1990s@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,6 +24,48 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "邮件已发送"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "加密"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "无法从应用商店载入列表"
@@ -33,11 +77,11 @@ msgstr "认证出错"
 
 #: ajax/changedisplayname.php:31
 msgid "Your full name has been changed."
-msgstr ""
+msgstr "您的全名已修改。"
 
 #: ajax/changedisplayname.php:34
 msgid "Unable to change full name"
-msgstr ""
+msgstr "无法修改全名"
 
 #: ajax/creategroup.php:10
 msgid "Group already exists"
@@ -91,11 +135,11 @@ msgstr "无法更新 app。"
 
 #: changepassword/controller.php:20
 msgid "Wrong password"
-msgstr ""
+msgstr "错误密码"
 
 #: changepassword/controller.php:42
 msgid "No user supplied"
-msgstr ""
+msgstr "没有满足的用户"
 
 #: changepassword/controller.php:74
 msgid ""
@@ -116,64 +160,92 @@ msgstr ""
 
 #: changepassword/controller.php:92 changepassword/controller.php:103
 msgid "Unable to change password"
+msgstr "不能更改密码"
+
+#: js/admin.js:73
+msgid "Sending..."
 msgstr ""
 
-#: js/apps.js:43
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "用户文档"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "更新至 {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "禁用"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "开启"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "请稍等...."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "禁用 app 时出错"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "启用 app 时出错"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "正在更新...."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "更新 app 时出错"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "错误"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "更新"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "正在解密文件... 请稍等，可能需要一些时间。"
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "保存中"
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "已经删除"
@@ -186,75 +258,99 @@ msgstr "撤销"
 msgid "Unable to remove user"
 msgstr "无法移除用户"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "组"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "组管理员"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "删除"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "添加组"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "必须提供合法的用户名"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "创建用户出错"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "必须提供合法的密码"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
-msgstr ""
+msgstr "警告：用户 \"{user}\" 的家目录已存在"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "简体中文"
 
 #: templates/admin.php:8
 msgid "Everything (fatal issues, errors, warnings, info, debug)"
-msgstr ""
+msgstr "所有（灾难性问题，错误，警告，信息，调试）"
 
 #: templates/admin.php:9
 msgid "Info, warnings, errors and fatal issues"
-msgstr ""
+msgstr "信息，警告，错误和灾难性问题"
 
 #: templates/admin.php:10
 msgid "Warnings, errors and fatal issues"
-msgstr ""
+msgstr "警告，错误和灾难性问题"
 
 #: templates/admin.php:11
 msgid "Errors and fatal issues"
-msgstr ""
+msgstr "错误和灾难性问题"
 
 #: templates/admin.php:12
 msgid "Fatal issues only"
+msgstr "仅灾难性问题"
+
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "无"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "登录"
+
+#: templates/admin.php:18
+msgid "Plain"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -263,68 +359,68 @@ msgid ""
 "root."
 msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。"
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "设置警告"
 
-#: templates/admin.php:53
+#: 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 "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏."
 
-#: templates/admin.php:54
+#: 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:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "模块'文件信息'丢失"
 
-#: templates/admin.php:68
+#: 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 "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果."
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
-msgstr ""
+msgstr "您的 PHP 版本不是最新版"
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "本地化无法工作"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "因特网连接无法工作"
 
-#: templates/admin.php:121
+#: 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 "
@@ -333,118 +429,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接."
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "计划任务"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "每个页面加载后执行一个任务"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
-msgstr ""
+msgstr "使用系统 cron 服务每15分钟调用一次 cron.php 文件。"
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "共享"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "启用共享API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "允许应用软件使用共享API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "允许链接"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "允许用户使用连接公开共享项目"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "允许公开上传"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "用户可让其他人上传到他的公开共享文件夹"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "允许再次共享"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "允许用户将共享给他们的项目再次共享"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "允许用户向任何人共享"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "允许用户只向同组用户共享"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
-msgstr ""
+msgstr "允许邮件通知"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
-msgstr ""
+msgstr "允许用户为共享的文件发送邮件通知"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "安全"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "强制使用 HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "强制客户端通过加密连接连接到%s。"
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL."
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "服务器地址"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "端口"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "凭证"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "日志级别"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -454,30 +610,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。"
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "添加应用"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "更多应用"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "选择一个应用"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "查看在 app.owncloud.com 的应用程序页面"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "用户文档"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "管理员文档"
@@ -511,7 +671,7 @@ msgstr "再次显示首次运行向导"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "密码"
 
@@ -523,151 +683,149 @@ msgstr "密码已修改"
 msgid "Unable to change your password"
 msgstr "无法修改密码"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "当前密码"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "新密码"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "修改密码"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
-msgstr ""
+msgstr "全名"
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "电子邮件"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "您的电子邮件"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "填写电子邮件地址以启用密码恢复功能"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "联系人图片"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
-msgstr ""
+msgstr "上传新的"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
-msgstr ""
+msgstr "从文件中选择一个新的"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
-msgstr ""
+msgstr "移除图片"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
-msgstr ""
+msgstr "您的头像由您的原始账户所提供。"
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "取消"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "语言"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "帮助翻译"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
-msgstr ""
+msgstr "使用这个地址 <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "加密"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "登录密码"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "解密所有文件"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "登录名称"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "创建"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "管理恢复密码"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "输入恢复密码来在更改密码的时候恢复用户文件"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "默认存储"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
-msgstr ""
+msgstr "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")"
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "无限"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "其它"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "用户名"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "存储"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
-msgstr ""
+msgstr "更改全名"
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "设置新密码"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "默认"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 593b32a237..79cecd9f5e 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Martin Liu <liuzh66@gmail.com>, 2014
 # modokwang <modokwang@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,43 +88,43 @@ msgstr "成功"
 msgid "Error"
 msgstr "错误"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "选择分组"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "连接测试成功"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "连接测试失败"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "您真的想要删除当前服务器配置吗？"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "确认删除"
 
@@ -139,11 +140,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -161,7 +162,7 @@ msgstr "帮助"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -197,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -265,7 +266,7 @@ msgstr "您可以在高级选项卡里为用户和组指定Base DN"
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -284,7 +285,7 @@ msgstr "返回"
 
 #: templates/part.wizardcontrols.php:8
 msgid "Continue"
-msgstr ""
+msgstr "继续"
 
 #: templates/settings.php:11
 msgid ""
@@ -331,7 +332,7 @@ msgstr "禁用主服务器"
 
 #: templates/settings.php:25
 msgid "Only connect to the replica server."
-msgstr ""
+msgstr "只能连接到复制服务器"
 
 #: templates/settings.php:26
 msgid "Case insensitve LDAP server (Windows)"
@@ -408,41 +409,51 @@ msgstr "群组搜索属性"
 msgid "Group-Member association"
 msgstr "组成员关联"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "特殊属性"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "配额字段"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "默认配额"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "字节数"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "电邮字段"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "用户主目录命名规则"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "内部用户名"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -458,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr "内部用户名属性："
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr "超越UUID检测"
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -477,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr "用户名-LDAP用户映射"
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -503,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr "清除用户-LDAP用户映射"
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr "清除组用户-LDAP级映射"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index 09b9c5cfc6..2b6ff7ae0d 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,12 +17,11 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
 msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr ""
@@ -39,19 +38,6 @@ msgstr ""
 msgid "Updated database"
 msgstr ""
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr ""
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr ""
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr ""
@@ -72,131 +58,135 @@ msgstr ""
 msgid "No crop data provided"
 msgstr ""
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "星期日"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "星期一"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "星期二"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "星期三"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "星期四"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "星期五"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "星期六"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr ""
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "今日"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "昨日"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "前一月"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "個月之前"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr ""
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr ""
 
@@ -263,6 +253,26 @@ msgstr ""
 msgid "Error loading file exists template"
 msgstr ""
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "已分享"
@@ -271,12 +281,12 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "錯誤"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -288,123 +298,123 @@ msgstr "取消分享時發生錯誤"
 msgid "Error while changing permissions"
 msgstr "更改權限時發生錯誤"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner}與你及群組的分享"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner}與你的分享"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr ""
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr ""
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "密碼"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr ""
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "傳送"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "設定分享期限"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "分享期限"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "以電郵分享"
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "找不到"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr ""
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "取消分享"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr ""
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr ""
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "新增"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "刪除"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "密碼保護"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "傳送中"
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "郵件已傳"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr ""
 
@@ -451,11 +461,17 @@ msgstr ""
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "更新成功, 正"
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr ""
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "請用以下連結重設你的密碼: {link}"
@@ -475,8 +491,8 @@ msgstr ""
 msgid "You will receive a link to reset your password via Email."
 msgstr "你將收到一封電郵"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "用戶名稱"
 
@@ -512,6 +528,18 @@ msgstr "新密碼"
 msgid "Reset password"
 msgstr "重設密碼"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "個人"
@@ -520,7 +548,7 @@ msgstr "個人"
 msgid "Users"
 msgstr "用戶"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "軟件"
 
@@ -630,49 +658,47 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立管理員帳戶"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "進階"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "設定資料庫"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "將被使用"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "資料庫帳戶"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr ""
 
@@ -688,7 +714,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "登出"
 
@@ -714,27 +740,27 @@ msgstr ""
 msgid "Please contact your administrator."
 msgstr ""
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "忘記密碼"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "登入"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr ""
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
 msgstr ""
 
 #: templates/singleuser.user.php:3
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index cb68c72f40..af3a338f96 100644
--- a/l10n/zh_HK/files.po
+++ b/l10n/zh_HK/files.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,280 +17,287 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr ""
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr ""
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr ""
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
 msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr ""
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr ""
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr ""
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr ""
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr ""
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr ""
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr ""
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr ""
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr ""
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr ""
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr ""
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr ""
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "文件"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
 msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr ""
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr ""
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr ""
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr ""
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr ""
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr ""
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
 msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr ""
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr ""
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr ""
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr ""
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr ""
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr ""
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "錯誤"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr ""
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr ""
 
@@ -298,12 +305,12 @@ msgstr ""
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "上傳"
 
@@ -339,72 +346,68 @@ msgstr ""
 msgid "Save"
 msgstr "儲存"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr ""
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr ""
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr ""
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr ""
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr ""
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index 7ae52b08cc..e70443ec44 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:08+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,18 +80,18 @@ msgid ""
 "administrator"
 msgstr ""
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr ""
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr ""
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr ""
 
@@ -99,8 +99,8 @@ msgstr ""
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
 msgstr ""
 
 #: templates/invalid_private_key.php:8
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index 5bd454412d..a65b3d8e31 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,40 +17,44 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr ""
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr ""
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr ""
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr ""
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr ""
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr ""
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -102,22 +106,22 @@ msgid "Users"
 msgstr "用戶"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr ""
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
+msgid "Allow users to mount the following external storage"
 msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/zh_HK/files_sharing.po b/l10n/zh_HK/files_sharing.po
index 2fceb799c3..2061b0b7dc 100644
--- a/l10n/zh_HK/files_sharing.po
+++ b/l10n/zh_HK/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,10 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr ""
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr ""
@@ -53,32 +57,16 @@ msgstr ""
 msgid "For more info, please ask the person who sent this link."
 msgstr ""
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
+msgid "shared by %s"
 msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
+msgid "Download %s"
 msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "下載"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "上傳"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr ""
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr ""
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/zh_HK/files_trashbin.po b/l10n/zh_HK/files_trashbin.po
index 173849a4d3..48a2e1f28e 100644
--- a/l10n/zh_HK/files_trashbin.po
+++ b/l10n/zh_HK/files_trashbin.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,44 +17,48 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr ""
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "錯誤"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:852 lib/trashbin.php:854
 msgid "restored"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr ""
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "名稱"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr ""
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr ""
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr ""
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index 752cf5e22c..6219708a09 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/lib.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,38 +17,38 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr ""
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr ""
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "幫助"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "個人"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "設定"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "用戶"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "管理"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr ""
@@ -61,15 +61,10 @@ msgstr ""
 msgid "Invalid image"
 msgstr ""
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr ""
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr ""
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr ""
@@ -92,74 +87,78 @@ msgid ""
 "administrator."
 msgstr ""
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr ""
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr ""
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr ""
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr ""
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr ""
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "文件"
@@ -199,7 +198,7 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr ""
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
+msgid "MySQL/MariaDB username and/or password not valid"
 msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
@@ -227,20 +226,20 @@ msgstr ""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
 msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
+msgid "Drop this user from MySQL/MariaDB"
 msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
 msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
+msgid "Drop this user from MySQL/MariaDB."
 msgstr ""
 
 #: private/setup/oci.php:34
@@ -268,62 +267,68 @@ msgstr ""
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr ""
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr ""
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "今日"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "昨日"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "前一月"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr ""
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index b11bddc20a..abc1f449b5 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,48 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "郵件已傳"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "加密"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
@@ -113,60 +155,88 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr ""
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr ""
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr ""
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "錯誤"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr ""
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr ""
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr ""
 
-#: js/personal.js:266
-msgid "Decrypting files... Please wait, this can take some time."
+#: js/personal.js:277
+msgid "Very weak password"
 msgstr ""
 
-#: js/personal.js:287
-msgid "Saving..."
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
+msgid "Decrypting files... Please wait, this can take some time."
 msgstr ""
 
 #: js/users.js:47
@@ -181,40 +251,40 @@ msgstr ""
 msgid "Unable to remove user"
 msgstr ""
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "群組"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr ""
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "刪除"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr ""
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr ""
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr ""
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr ""
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
@@ -238,18 +308,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
-msgid "Security Warning"
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "空"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr ""
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
 msgstr ""
 
 #: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
+msgid "Security Warning"
+msgstr ""
+
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -258,68 +352,68 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:53
+#: 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 ""
 
-#: templates/admin.php:54
+#: templates/admin.php:79
 #, php-format
 msgid "Please double check the <a href=\"%s\">installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:68
+#: 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 ""
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr ""
 
-#: templates/admin.php:121
+#: 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 "
@@ -328,118 +422,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr ""
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr ""
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr ""
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr ""
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr ""
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "連接埠"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr ""
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -449,28 +603,32 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr ""
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:41
-msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:50
+msgid "See application website"
 msgstr ""
 
-#: templates/help.php:4
-msgid "User Documentation"
+#: templates/apps.php:52
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:6
@@ -506,7 +664,7 @@ msgstr ""
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "密碼"
 
@@ -518,151 +676,149 @@ msgstr ""
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "新密碼"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "電郵"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
+#: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
 msgstr ""
 
-#: templates/personal.php:86
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr ""
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "取消"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr ""
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr ""
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "加密"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr ""
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr ""
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "用戶名稱"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr ""
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 8ba0903b18..67182c3f7e 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/user_ldap.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,43 +86,43 @@ msgstr "成功"
 msgid "Error"
 msgstr "錯誤"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr "幫助"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -196,7 +196,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -264,7 +264,7 @@ msgstr ""
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -407,41 +407,51 @@ msgstr ""
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -457,15 +467,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -476,19 +486,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -502,10 +512,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 6477db46c3..9595c3fa22 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-22 01:55-0400\n"
+"PO-Revision-Date: 2014-03-22 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +19,11 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:119 ajax/share.php:198
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr "%s 與您分享了 %s"
+#: ajax/share.php:88
+msgid "Expiration date is in the past."
+msgstr ""
 
-#: ajax/share.php:169
+#: ajax/share.php:120 ajax/share.php:162
 #, php-format
 msgid "Couldn't send mail to following users: %s "
 msgstr "無法寄送郵件給這些使用者：%s"
@@ -41,19 +40,6 @@ msgstr "已停用維護模式"
 msgid "Updated database"
 msgstr "已更新資料庫"
 
-#: ajax/update.php:20
-msgid "Updating filecache, this may take really long..."
-msgstr "更新檔案快取，這可能要很久…"
-
-#: ajax/update.php:23
-msgid "Updated filecache"
-msgstr "已更新檔案快取"
-
-#: ajax/update.php:26
-#, php-format
-msgid "... %d%% done ..."
-msgstr "已完成 %d%%"
-
 #: avatar/controller.php:62
 msgid "No image or file provided"
 msgstr "未提供圖片或檔案"
@@ -74,131 +60,135 @@ msgstr "沒有臨時用的大頭貼，請再試一次"
 msgid "No crop data provided"
 msgstr "未設定剪裁"
 
-#: js/config.php:32
+#: js/config.php:36
 msgid "Sunday"
 msgstr "週日"
 
-#: js/config.php:33
+#: js/config.php:37
 msgid "Monday"
 msgstr "週一"
 
-#: js/config.php:34
+#: js/config.php:38
 msgid "Tuesday"
 msgstr "週二"
 
-#: js/config.php:35
+#: js/config.php:39
 msgid "Wednesday"
 msgstr "週三"
 
-#: js/config.php:36
+#: js/config.php:40
 msgid "Thursday"
 msgstr "週四"
 
-#: js/config.php:37
+#: js/config.php:41
 msgid "Friday"
 msgstr "週五"
 
-#: js/config.php:38
+#: js/config.php:42
 msgid "Saturday"
 msgstr "週六"
 
-#: js/config.php:43
+#: js/config.php:47
 msgid "January"
 msgstr "一月"
 
-#: js/config.php:44
+#: js/config.php:48
 msgid "February"
 msgstr "二月"
 
-#: js/config.php:45
+#: js/config.php:49
 msgid "March"
 msgstr "三月"
 
-#: js/config.php:46
+#: js/config.php:50
 msgid "April"
 msgstr "四月"
 
-#: js/config.php:47
+#: js/config.php:51
 msgid "May"
 msgstr "五月"
 
-#: js/config.php:48
+#: js/config.php:52
 msgid "June"
 msgstr "六月"
 
-#: js/config.php:49
+#: js/config.php:53
 msgid "July"
 msgstr "七月"
 
-#: js/config.php:50
+#: js/config.php:54
 msgid "August"
 msgstr "八月"
 
-#: js/config.php:51
+#: js/config.php:55
 msgid "September"
 msgstr "九月"
 
-#: js/config.php:52
+#: js/config.php:56
 msgid "October"
 msgstr "十月"
 
-#: js/config.php:53
+#: js/config.php:57
 msgid "November"
 msgstr "十一月"
 
-#: js/config.php:54
+#: js/config.php:58
 msgid "December"
 msgstr "十二月"
 
-#: js/js.js:398
+#: js/js.js:458
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:869
+#: js/js.js:496
+msgid "Saving..."
+msgstr "儲存中..."
+
+#: js/js.js:995
 msgid "seconds ago"
 msgstr "幾秒前"
 
-#: js/js.js:870
+#: js/js.js:996
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分鐘前"
 
-#: js/js.js:871
+#: js/js.js:997
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小時前"
 
-#: js/js.js:872
+#: js/js.js:998
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:873
+#: js/js.js:999
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:874
+#: js/js.js:1000
 msgid "%n day ago"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: js/js.js:875
+#: js/js.js:1001
 msgid "last month"
 msgstr "上個月"
 
-#: js/js.js:876
+#: js/js.js:1002
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 個月前"
 
-#: js/js.js:877
+#: js/js.js:1003
 msgid "months ago"
 msgstr "幾個月前"
 
-#: js/js.js:878
+#: js/js.js:1004
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:879
+#: js/js.js:1005
 msgid "years ago"
 msgstr "幾年前"
 
@@ -265,6 +255,26 @@ msgstr "（已選 {count} 項）"
 msgid "Error loading file exists template"
 msgstr "載入檔案存在樣板出錯"
 
+#: js/setup.js:84
+msgid "Very weak password"
+msgstr ""
+
+#: js/setup.js:85
+msgid "Weak password"
+msgstr ""
+
+#: js/setup.js:86
+msgid "So-so password"
+msgstr ""
+
+#: js/setup.js:87
+msgid "Good password"
+msgstr ""
+
+#: js/setup.js:88
+msgid "Strong password"
+msgstr ""
+
 #: js/share.js:51 js/share.js:66 js/share.js:106
 msgid "Shared"
 msgstr "已分享"
@@ -273,12 +283,12 @@ msgstr "已分享"
 msgid "Share"
 msgstr "分享"
 
-#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:707
-#: js/share.js:719 templates/installation.php:10
+#: js/share.js:158 js/share.js:171 js/share.js:178 js/share.js:711
+#: templates/installation.php:10
 msgid "Error"
 msgstr "錯誤"
 
-#: js/share.js:160 js/share.js:747
+#: js/share.js:160 js/share.js:767
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -290,123 +300,123 @@ msgstr "取消分享時發生錯誤"
 msgid "Error while changing permissions"
 msgstr "修改權限時發生錯誤"
 
-#: js/share.js:187
+#: js/share.js:188
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "由 {owner} 分享給您和 {group}"
 
-#: js/share.js:189
+#: js/share.js:190
 msgid "Shared with you by {owner}"
 msgstr "{owner} 已經和您分享"
 
-#: js/share.js:213
+#: js/share.js:214
 msgid "Share with user or group …"
 msgstr "與用戶或群組分享"
 
-#: js/share.js:219
+#: js/share.js:220
 msgid "Share link"
 msgstr "分享連結"
 
-#: js/share.js:222
+#: js/share.js:223
 msgid "Password protect"
 msgstr "密碼保護"
 
-#: js/share.js:224 templates/installation.php:58 templates/login.php:38
+#: js/share.js:225 templates/installation.php:60 templates/login.php:40
 msgid "Password"
 msgstr "密碼"
 
-#: js/share.js:229
+#: js/share.js:230
 msgid "Allow Public Upload"
 msgstr "允許任何人上傳"
 
-#: js/share.js:233
+#: js/share.js:234
 msgid "Email link to person"
 msgstr "將連結 email 給別人"
 
-#: js/share.js:234
+#: js/share.js:235
 msgid "Send"
 msgstr "寄出"
 
-#: js/share.js:239
+#: js/share.js:240
 msgid "Set expiration date"
 msgstr "指定到期日"
 
-#: js/share.js:240
+#: js/share.js:241
 msgid "Expiration date"
 msgstr "到期日"
 
-#: js/share.js:275
+#: js/share.js:277
 msgid "Share via email:"
 msgstr "透過電子郵件分享："
 
-#: js/share.js:278
+#: js/share.js:280
 msgid "No people found"
 msgstr "沒有找到任何人"
 
-#: js/share.js:322 js/share.js:359
+#: js/share.js:324 js/share.js:363
 msgid "group"
 msgstr "群組"
 
-#: js/share.js:333
+#: js/share.js:335
 msgid "Resharing is not allowed"
 msgstr "不允許重新分享"
 
-#: js/share.js:375
+#: js/share.js:379
 msgid "Shared in {item} with {user}"
 msgstr "已和 {user} 分享 {item}"
 
-#: js/share.js:397
+#: js/share.js:401
 msgid "Unshare"
 msgstr "取消分享"
 
-#: js/share.js:405
+#: js/share.js:409
 msgid "notify by email"
 msgstr "以 email 通知"
 
-#: js/share.js:408
+#: js/share.js:412
 msgid "can edit"
 msgstr "可編輯"
 
-#: js/share.js:410
+#: js/share.js:414
 msgid "access control"
 msgstr "存取控制"
 
-#: js/share.js:413
+#: js/share.js:417
 msgid "create"
 msgstr "建立"
 
-#: js/share.js:416
+#: js/share.js:420
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:419
+#: js/share.js:423
 msgid "delete"
 msgstr "刪除"
 
-#: js/share.js:422
+#: js/share.js:426
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:694
+#: js/share.js:698
 msgid "Password protected"
 msgstr "受密碼保護"
 
-#: js/share.js:707
+#: js/share.js:711
 msgid "Error unsetting expiration date"
 msgstr "取消到期日設定失敗"
 
-#: js/share.js:719
+#: js/share.js:729
 msgid "Error setting expiration date"
 msgstr "設定到期日發生錯誤"
 
-#: js/share.js:734
+#: js/share.js:754
 msgid "Sending ..."
 msgstr "正在傳送…"
 
-#: js/share.js:745
+#: js/share.js:765
 msgid "Email sent"
 msgstr "Email 已寄出"
 
-#: js/share.js:769
+#: js/share.js:789
 msgid "Warning"
 msgstr "警告"
 
@@ -453,11 +463,17 @@ msgstr "升級失敗，請將此問題回報 <a href=\"https://github.com/ownclo
 msgid "The update was successful. Redirecting you to ownCloud now."
 msgstr "升級成功，正將您重新導向至 ownCloud 。"
 
-#: lostpassword/controller.php:62
+#: lostpassword/controller.php:70
 #, php-format
 msgid "%s password reset"
 msgstr "%s 密碼重設"
 
+#: lostpassword/controller.php:72
+msgid ""
+"A problem has occurred whilst sending the email, please contact your "
+"administrator."
+msgstr ""
+
 #: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "請至以下連結重設您的密碼： {link}"
@@ -477,8 +493,8 @@ msgstr "請求失敗！<br>您確定填入的電子郵件地址或是帳號名
 msgid "You will receive a link to reset your password via Email."
 msgstr "重設密碼的連結將會寄到您的電子郵件信箱。"
 
-#: lostpassword/templates/lostpassword.php:21 templates/installation.php:52
-#: templates/login.php:31
+#: lostpassword/templates/lostpassword.php:21 templates/installation.php:53
+#: templates/login.php:32
 msgid "Username"
 msgstr "使用者名稱"
 
@@ -514,6 +530,18 @@ msgstr "新密碼"
 msgid "Reset password"
 msgstr "重設密碼"
 
+#: setup/controller.php:138
+#, php-format
+msgid ""
+"Mac OS X is not supported and %s will not work properly on this platform. "
+"Use it at your own risk! "
+msgstr ""
+
+#: setup/controller.php:142
+msgid ""
+"For the best results, please consider using a GNU/Linux server instead."
+msgstr ""
+
 #: strings.php:5
 msgid "Personal"
 msgstr "個人"
@@ -522,7 +550,7 @@ msgstr "個人"
 msgid "Users"
 msgstr "使用者"
 
-#: strings.php:7 templates/layout.user.php:111
+#: strings.php:7 templates/layout.user.php:116
 msgid "Apps"
 msgstr "應用程式"
 
@@ -632,49 +660,47 @@ msgstr "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一個<strong>管理者帳號</strong>"
 
-#: templates/installation.php:67
-msgid "Advanced"
-msgstr "進階"
+#: templates/installation.php:70
+msgid "Storage & database"
+msgstr ""
 
-#: templates/installation.php:74
+#: templates/installation.php:77
 msgid "Data folder"
 msgstr "資料儲存位置"
 
-#: templates/installation.php:86
+#: templates/installation.php:90
 msgid "Configure the database"
 msgstr "設定資料庫"
 
-#: templates/installation.php:91 templates/installation.php:103
-#: templates/installation.php:114 templates/installation.php:125
-#: templates/installation.php:137
+#: templates/installation.php:94
 msgid "will be used"
 msgstr "將會使用"
 
-#: templates/installation.php:149
+#: templates/installation.php:109
 msgid "Database user"
 msgstr "資料庫使用者"
 
-#: templates/installation.php:156
+#: templates/installation.php:118
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: templates/installation.php:161
+#: templates/installation.php:123
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: templates/installation.php:169
+#: templates/installation.php:132
 msgid "Database tablespace"
 msgstr "資料庫 tablespace"
 
-#: templates/installation.php:176
+#: templates/installation.php:140
 msgid "Database host"
 msgstr "資料庫主機"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finish setup"
 msgstr "完成設定"
 
-#: templates/installation.php:185
+#: templates/installation.php:150
 msgid "Finishing …"
 msgstr "即將完成…"
 
@@ -690,7 +716,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr "%s 已經釋出，瞭解更多資訊以進行更新。"
 
-#: templates/layout.user.php:72 templates/singleuser.user.php:8
+#: templates/layout.user.php:74 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr "登出"
 
@@ -716,28 +742,28 @@ msgstr "伺服器端認證失敗！"
 msgid "Please contact your administrator."
 msgstr "請聯絡系統管理員。"
 
-#: templates/login.php:44
+#: templates/login.php:46
 msgid "Lost your password?"
 msgstr "忘記密碼？"
 
-#: templates/login.php:49
+#: templates/login.php:51
 msgid "remember"
 msgstr "記住"
 
-#: templates/login.php:52
+#: templates/login.php:54
 msgid "Log in"
 msgstr "登入"
 
-#: templates/login.php:58
+#: templates/login.php:60
 msgid "Alternative Logins"
 msgstr "其他登入方法"
 
 #: templates/mail.php:15
 #, php-format
 msgid ""
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a "
-"href=\"%s\">View it!</a><br><br>"
-msgstr "嗨，<br><br>%s 和你分享了 %s ，到<a href=\"%s\">這裡</a>看它<br><br>"
+"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> "
+"with you.<br><a href=\"%s\">View it!</a><br><br>"
+msgstr ""
 
 #: templates/singleuser.user.php:3
 msgid "This ownCloud instance is currently in single user mode."
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 6ab2b48b56..a83f1fff46 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/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-01-04 01:55-0500\n"
-"PO-Revision-Date: 2014-01-03 12:00+0000\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -19,280 +19,287 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/move.php:17
+#: ajax/move.php:15
 #, php-format
 msgid "Could not move %s - File with this name already exists"
 msgstr "無法移動 %s ，同名的檔案已經存在"
 
-#: ajax/move.php:27 ajax/move.php:30
+#: ajax/move.php:25 ajax/move.php:28
 #, php-format
 msgid "Could not move %s"
 msgstr "無法移動 %s"
 
-#: ajax/newfile.php:56 js/files.js:74
+#: ajax/newfile.php:58 js/files.js:98
 msgid "File name cannot be empty."
 msgstr "檔名不能為空"
 
-#: ajax/newfile.php:62
-msgid "File name must not contain \"/\". Please choose a different name."
-msgstr "檔名不能包含 \"/\" ，請選其他名字"
+#: ajax/newfile.php:63
+#, php-format
+msgid "\"%s\" is an invalid file name."
+msgstr ""
 
-#: ajax/newfile.php:72 ajax/newfolder.php:37 lib/app.php:67
+#: ajax/newfile.php:69 ajax/newfolder.php:28 js/files.js:105
+msgid ""
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
+"allowed."
+msgstr "檔名不合法，不允許 \\ / < > : \" | ? * 字元"
+
+#: ajax/newfile.php:76 ajax/newfolder.php:35 ajax/upload.php:141
+#: lib/app.php:65
+msgid "The target folder has been moved or deleted."
+msgstr ""
+
+#: ajax/newfile.php:88 ajax/newfolder.php:47 lib/app.php:74
 #, php-format
 msgid ""
 "The name %s is already used in the folder %s. Please choose a different "
 "name."
 msgstr "%s 已經被使用於資料夾 %s ，請換一個名字"
 
-#: ajax/newfile.php:81
+#: ajax/newfile.php:97
 msgid "Not a valid source"
 msgstr "不是有效的來源"
 
-#: ajax/newfile.php:86
+#: ajax/newfile.php:102
 msgid ""
 "Server is not allowed to open URLs, please check the server configuration"
 msgstr ""
 
-#: ajax/newfile.php:103
+#: ajax/newfile.php:119
 #, php-format
 msgid "Error while downloading %s to %s"
 msgstr "下載 %s 到 %s 失敗"
 
-#: ajax/newfile.php:140
+#: ajax/newfile.php:156
 msgid "Error when creating the file"
 msgstr "建立檔案失敗"
 
-#: ajax/newfolder.php:21
+#: ajax/newfolder.php:22
 msgid "Folder name cannot be empty."
 msgstr "資料夾名稱不能留空"
 
-#: ajax/newfolder.php:27
-msgid "Folder name must not contain \"/\". Please choose a different name."
-msgstr "資料夾名稱不能包含 \"/\" ，請選其他名字"
-
-#: ajax/newfolder.php:56
+#: ajax/newfolder.php:66
 msgid "Error when creating the folder"
 msgstr "建立資料夾失敗"
 
-#: ajax/upload.php:18 ajax/upload.php:50
+#: ajax/upload.php:19 ajax/upload.php:53
 msgid "Unable to set upload directory."
 msgstr "無法設定上傳目錄"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:29
 msgid "Invalid Token"
 msgstr "無效的 token"
 
-#: ajax/upload.php:64
+#: ajax/upload.php:71
 msgid "No file was uploaded. Unknown error"
 msgstr "沒有檔案被上傳，原因未知"
 
-#: ajax/upload.php:71
+#: ajax/upload.php:78
 msgid "There is no error, the file uploaded with success"
 msgstr "一切都順利，檔案上傳成功"
 
-#: ajax/upload.php:72
+#: ajax/upload.php:79
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定："
 
-#: ajax/upload.php:74
+#: ajax/upload.php:81
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制"
 
-#: ajax/upload.php:75
+#: ajax/upload.php:82
 msgid "The uploaded file was only partially uploaded"
 msgstr "只有檔案的一部分被上傳"
 
-#: ajax/upload.php:76
+#: ajax/upload.php:83
 msgid "No file was uploaded"
 msgstr "沒有檔案被上傳"
 
-#: ajax/upload.php:77
+#: ajax/upload.php:84
 msgid "Missing a temporary folder"
 msgstr "找不到暫存資料夾"
 
-#: ajax/upload.php:78
+#: ajax/upload.php:85
 msgid "Failed to write to disk"
 msgstr "寫入硬碟失敗"
 
-#: ajax/upload.php:96
+#: ajax/upload.php:103
 msgid "Not enough storage available"
 msgstr "儲存空間不足"
 
-#: ajax/upload.php:127 ajax/upload.php:154
-msgid "Upload failed. Could not get file info."
-msgstr "上傳失敗，無法取得檔案資訊"
-
-#: ajax/upload.php:144
+#: ajax/upload.php:160
 msgid "Upload failed. Could not find uploaded file"
 msgstr "上傳失敗，找不到上傳的檔案"
 
-#: ajax/upload.php:172
+#: ajax/upload.php:170
+msgid "Upload failed. Could not get file info."
+msgstr "上傳失敗，無法取得檔案資訊"
+
+#: ajax/upload.php:189
 msgid "Invalid directory."
 msgstr "無效的資料夾"
 
-#: appinfo/app.php:11
+#: appinfo/app.php:11 js/filelist.js:14
 msgid "Files"
 msgstr "檔案"
 
-#: js/file-upload.js:228
+#: js/file-upload.js:247
 msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
 msgstr "因為 {filename} 是個目錄或是大小為零，所以無法上傳"
 
-#: js/file-upload.js:239
-msgid "Not enough space available"
-msgstr "沒有足夠的可用空間"
+#: js/file-upload.js:258
+msgid "Total file size {size1} exceeds upload limit {size2}"
+msgstr ""
 
-#: js/file-upload.js:306
+#: js/file-upload.js:268
+msgid ""
+"Not enough free space, you are uploading {size1} but only {size2} is left"
+msgstr ""
+
+#: js/file-upload.js:340
 msgid "Upload cancelled."
 msgstr "上傳已取消"
 
-#: js/file-upload.js:344
+#: js/file-upload.js:385
 msgid "Could not get result from server."
 msgstr "無法從伺服器取回結果"
 
-#: js/file-upload.js:436
+#: js/file-upload.js:477
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中，離開此頁面將會取消上傳。"
 
-#: js/file-upload.js:523
+#: js/file-upload.js:564
 msgid "URL cannot be empty"
 msgstr "URL 不能留空"
 
-#: js/file-upload.js:527 js/filelist.js:377
+#: js/file-upload.js:568
 msgid "In the home folder 'Shared' is a reserved filename"
 msgstr "在家目錄中不能使用「共享」作為檔名"
 
-#: js/file-upload.js:529 js/filelist.js:379
+#: js/file-upload.js:570 js/filelist.js:430
 msgid "{new_name} already exists"
 msgstr "{new_name} 已經存在"
 
-#: js/file-upload.js:595
+#: js/file-upload.js:636
 msgid "Could not create file"
 msgstr "無法建立檔案"
 
-#: js/file-upload.js:611
+#: js/file-upload.js:652
 msgid "Could not create folder"
 msgstr "無法建立資料夾"
 
-#: js/file-upload.js:661
+#: js/file-upload.js:702
 msgid "Error fetching URL"
 msgstr ""
 
-#: js/fileactions.js:125
+#: js/fileactions.js:149
 msgid "Share"
 msgstr "分享"
 
-#: js/fileactions.js:137
+#: js/fileactions.js:162
 msgid "Delete permanently"
 msgstr "永久刪除"
 
-#: js/fileactions.js:194
+#: js/fileactions.js:223
 msgid "Rename"
 msgstr "重新命名"
 
-#: js/filelist.js:69 js/filelist.js:72 js/filelist.js:889
+#: js/filelist.js:107 js/filelist.js:110 js/filelist.js:992
 msgid "Pending"
 msgstr "等候中"
 
-#: js/filelist.js:405
+#: js/filelist.js:456
 msgid "Could not rename file"
 msgstr "無法重新命名"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "replaced {new_name} with {old_name}"
 msgstr "使用 {new_name} 取代 {old_name}"
 
-#: js/filelist.js:539
+#: js/filelist.js:591
 msgid "undo"
 msgstr "復原"
 
-#: js/filelist.js:591
+#: js/filelist.js:662
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:609 js/filelist.js:683 js/files.js:631
+#: js/filelist.js:687 js/filelist.js:761 js/files.js:691
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] "%n 個資料夾"
 
-#: js/filelist.js:610 js/filelist.js:684 js/files.js:637
+#: js/filelist.js:688 js/filelist.js:762 js/files.js:697
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] "%n 個檔案"
 
-#: js/filelist.js:617
+#: js/filelist.js:695
 msgid "{dirs} and {files}"
 msgstr "{dirs} 和 {files}"
 
-#: js/filelist.js:828 js/filelist.js:866
+#: js/filelist.js:931 js/filelist.js:969
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] "%n 個檔案正在上傳"
 
-#: js/files.js:72
-msgid "'.' is an invalid file name."
-msgstr "'.' 是不合法的檔名"
+#: js/files.js:96
+msgid "\"{name}\" is an invalid file name."
+msgstr ""
 
-#: js/files.js:81
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr "檔名不合法，不允許 \\ / < > : \" | ? * 字元"
-
-#: js/files.js:93
+#: js/files.js:117
 msgid "Your storage is full, files can not be updated or synced anymore!"
 msgstr "您的儲存空間已滿，沒有辦法再更新或是同步檔案！"
 
-#: js/files.js:97
+#: js/files.js:121
 msgid "Your storage is almost full ({usedSpacePercent}%)"
 msgstr "您的儲存空間快要滿了 ({usedSpacePercent}%)"
 
-#: js/files.js:110
+#: js/files.js:134
 msgid ""
 "Encryption App is enabled but your keys are not initialized, please log-out "
 "and log-in again"
 msgstr "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次"
 
-#: js/files.js:114
+#: js/files.js:138
 msgid ""
 "Invalid private key for Encryption App. Please update your private key "
 "password in your personal settings to recover access to your encrypted "
 "files."
 msgstr "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。"
 
-#: js/files.js:118
+#: js/files.js:142
 msgid ""
 "Encryption was disabled but your files are still encrypted. Please go to "
 "your personal settings to decrypt your files."
 msgstr "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。"
 
-#: js/files.js:349
+#: js/files.js:379
 msgid ""
 "Your download is being prepared. This might take some time if the files are "
 "big."
 msgstr "正在準備您的下載，若您的檔案較大，將會需要更多時間。"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error moving file"
 msgstr "移動檔案失敗"
 
-#: js/files.js:558 js/files.js:596
+#: js/files.js:610 js/files.js:654
 msgid "Error"
 msgstr "錯誤"
 
-#: js/files.js:613 templates/index.php:56
+#: js/files.js:672 templates/index.php:68
 msgid "Name"
 msgstr "名稱"
 
-#: js/files.js:614 templates/index.php:68
+#: js/files.js:673 templates/index.php:80
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:615 templates/index.php:70
+#: js/files.js:674 templates/index.php:82
 msgid "Modified"
 msgstr "修改時間"
 
@@ -300,12 +307,12 @@ msgstr "修改時間"
 msgid "Invalid folder name. Usage of 'Shared' is reserved."
 msgstr ""
 
-#: lib/app.php:101
+#: lib/app.php:111
 #, php-format
 msgid "%s could not be renamed"
 msgstr "無法重新命名 %s"
 
-#: lib/helper.php:11 templates/index.php:16
+#: lib/helper.php:14 templates/index.php:23
 msgid "Upload"
 msgstr "上傳"
 
@@ -341,72 +348,68 @@ msgstr "ZIP 壓縮前的原始大小限制"
 msgid "Save"
 msgstr "儲存"
 
-#: templates/index.php:5
+#: templates/index.php:6
 msgid "New"
 msgstr "新增"
 
-#: templates/index.php:8
+#: templates/index.php:9
 msgid "New text file"
 msgstr ""
 
-#: templates/index.php:8
+#: templates/index.php:10
 msgid "Text file"
 msgstr "文字檔"
 
-#: templates/index.php:10
+#: templates/index.php:13
 msgid "New folder"
 msgstr "新資料夾"
 
-#: templates/index.php:10
+#: templates/index.php:14
 msgid "Folder"
 msgstr "資料夾"
 
-#: templates/index.php:12
+#: templates/index.php:17
 msgid "From link"
 msgstr "從連結"
 
-#: templates/index.php:29
+#: templates/index.php:41
 msgid "Deleted files"
 msgstr "回收桶"
 
-#: templates/index.php:34
+#: templates/index.php:46
 msgid "Cancel upload"
 msgstr "取消上傳"
 
-#: templates/index.php:40
+#: templates/index.php:52
 msgid "You don’t have permission to upload or create files here"
 msgstr "您沒有權限在這裡上傳或建立檔案"
 
-#: templates/index.php:45
+#: templates/index.php:57
 msgid "Nothing in here. Upload something!"
 msgstr "這裡還沒有東西，上傳一些吧！"
 
-#: templates/index.php:62
+#: templates/index.php:74
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:73 templates/index.php:74
+#: templates/index.php:85 templates/index.php:86
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/index.php:86
+#: templates/index.php:98
 msgid "Upload too large"
 msgstr "上傳過大"
 
-#: templates/index.php:88
+#: templates/index.php:100
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您試圖上傳的檔案大小超過伺服器的限制。"
 
-#: templates/index.php:93
+#: templates/index.php:105
 msgid "Files are being scanned, please wait."
 msgstr "正在掃描檔案，請稍等。"
 
-#: templates/index.php:96
+#: templates/index.php:108
 msgid "Current scanning"
 msgstr "正在掃描"
-
-#: templates/upgrade.php:2
-msgid "Upgrading filesystem cache..."
-msgstr "正在升級檔案系統快取…"
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index c61687e7fe..7ce86652c8 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-29 14:08-0500\n"
-"PO-Revision-Date: 2013-11-29 19:09+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -83,18 +83,18 @@ msgid ""
 "administrator"
 msgstr "未知錯誤請檢查您的系統設定或是聯絡您的管理員"
 
-#: hooks/hooks.php:59
+#: hooks/hooks.php:64
 msgid "Missing requirements."
 msgstr "遺失必要條件。"
 
-#: hooks/hooks.php:60
+#: hooks/hooks.php:65
 msgid ""
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
 "together with the PHP extension is enabled and configured properly. For now,"
 " the encryption app has been disabled."
 msgstr "請確認已安裝 PHP 5.3.3 或是更新的版本以及 OpenSSL 也一併安裝在 PHP extension 裡面並啟用及設置完成。現在，加密功能是停用的。"
 
-#: hooks/hooks.php:273
+#: hooks/hooks.php:295
 msgid "Following users are not set up for encryption:"
 msgstr "以下的使用者無法設定加密:"
 
@@ -102,9 +102,9 @@ msgstr "以下的使用者無法設定加密:"
 msgid "Initial encryption started... This can take some time. Please wait."
 msgstr ""
 
-#: js/settings-admin.js:13
-msgid "Saving..."
-msgstr "儲存中..."
+#: js/detect-migration.js:25
+msgid "Initial encryption running... Please try again later."
+msgstr ""
 
 #: templates/invalid_private_key.php:8
 msgid "Go directly to your "
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index 16bf605635..b55ed7de36 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,40 +18,44 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/dropbox.js:7 js/dropbox.js:28 js/google.js:8 js/google.js:39
+#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
 msgid "Access granted"
 msgstr "允許存取"
 
-#: js/dropbox.js:30 js/dropbox.js:96 js/dropbox.js:102
+#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
 msgid "Error configuring Dropbox storage"
 msgstr "設定 Dropbox 儲存時發生錯誤"
 
-#: js/dropbox.js:65 js/google.js:86
+#: js/dropbox.js:68 js/google.js:89
 msgid "Grant access"
 msgstr "允許存取"
 
-#: js/dropbox.js:101
+#: js/dropbox.js:102
 msgid "Please provide a valid Dropbox app key and secret."
 msgstr "請提供有效的 Dropbox app key 和 app secret 。"
 
-#: js/google.js:42 js/google.js:121
+#: js/google.js:45 js/google.js:122
 msgid "Error configuring Google Drive storage"
 msgstr "設定 Google Drive 儲存時發生錯誤"
 
-#: lib/config.php:461
+#: js/settings.js:313 js/settings.js:320
+msgid "Saved"
+msgstr ""
+
+#: lib/config.php:512
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
 msgstr "<b>警告</b>：未安裝 \"smbclient\" ，因此無法掛載 CIFS/SMB 分享，請洽您的系統管理員將其安裝。"
 
-#: lib/config.php:465
+#: lib/config.php:516
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
 msgstr "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 FTP 分享，請洽您的系統管理員將其安裝並啓用。"
 
-#: lib/config.php:468
+#: lib/config.php:519
 msgid ""
 "<b>Warning:</b> The Curl support in PHP is not enabled or installed. "
 "Mounting of ownCloud / WebDAV or GoogleDrive is not possible. Please ask "
@@ -103,22 +107,22 @@ msgid "Users"
 msgstr "使用者"
 
 #: templates/settings.php:113 templates/settings.php:114
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:155 templates/settings.php:156
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/settings.php:129
+#: templates/settings.php:127
 msgid "Enable User External Storage"
 msgstr "啓用使用者外部儲存"
 
 #: templates/settings.php:130
-msgid "Allow users to mount their own external storage"
-msgstr "允許使用者自行掛載他們的外部儲存"
+msgid "Allow users to mount the following external storage"
+msgstr ""
 
-#: templates/settings.php:141
+#: templates/settings.php:147
 msgid "SSL root certificates"
 msgstr "SSL 根憑證"
 
-#: templates/settings.php:159
+#: templates/settings.php:165
 msgid "Import Root Certificate"
 msgstr "匯入根憑證"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index a80b4b29c6..d3707d7d70 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-11-15 22:54-0500\n"
-"PO-Revision-Date: 2013-11-13 16:11+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,10 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: js/share.js:13
+msgid "Shared by {owner}"
+msgstr "由 {owner} 分享"
+
 #: templates/authenticate.php:4
 msgid "This share is password-protected"
 msgstr "這個分享有密碼保護"
@@ -54,32 +58,16 @@ msgstr "分享功能已停用"
 msgid "For more info, please ask the person who sent this link."
 msgstr "請詢問告訴您此連結的人以瞭解更多"
 
-#: templates/public.php:18
+#: templates/public.php:17
 #, php-format
-msgid "%s shared the folder %s with you"
-msgstr "%s 和您分享了資料夾 %s "
+msgid "shared by %s"
+msgstr ""
 
-#: templates/public.php:21
+#: templates/public.php:44
 #, php-format
-msgid "%s shared the file %s with you"
-msgstr "%s 和您分享了檔案 %s"
+msgid "Download %s"
+msgstr ""
 
-#: templates/public.php:29 templates/public.php:95
-msgid "Download"
-msgstr "下載"
-
-#: templates/public.php:46 templates/public.php:49
-msgid "Upload"
-msgstr "上傳"
-
-#: templates/public.php:59
-msgid "Cancel upload"
-msgstr "取消上傳"
-
-#: templates/public.php:92
-msgid "No preview available for"
-msgstr "無法預覽"
-
-#: templates/public.php:99
+#: templates/public.php:48
 msgid "Direct link"
 msgstr ""
diff --git a/l10n/zh_TW/files_trashbin.po b/l10n/zh_TW/files_trashbin.po
index 77074528dd..b05b0b30ba 100644
--- a/l10n/zh_TW/files_trashbin.po
+++ b/l10n/zh_TW/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: 2013-11-21 10:01-0500\n"
-"PO-Revision-Date: 2013-11-16 07:44+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,44 +18,48 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/delete.php:42
+#: ajax/delete.php:59
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr "無法永久刪除 %s"
 
-#: ajax/undelete.php:42
+#: ajax/undelete.php:64
 #, php-format
 msgid "Couldn't restore %s"
 msgstr "無法還原 %s"
 
-#: js/trash.js:18 js/trash.js:44 js/trash.js:121 js/trash.js:149
+#: js/filelist.js:23
+msgid "Deleted files"
+msgstr "回收桶"
+
+#: js/trash.js:16 js/trash.js:103 js/trash.js:152
 msgid "Error"
 msgstr "錯誤"
 
-#: lib/trashbin.php:815 lib/trashbin.php:817
+#: lib/trashbin.php:853 lib/trashbin.php:855
 msgid "restored"
 msgstr "已還原"
 
-#: templates/index.php:8
+#: templates/index.php:7
 msgid "Nothing in here. Your trash bin is empty!"
 msgstr "您的回收桶是空的！"
 
-#: templates/index.php:22
+#: templates/index.php:20
 msgid "Name"
 msgstr "名稱"
 
-#: templates/index.php:25 templates/index.php:27
+#: templates/index.php:23 templates/index.php:25
 msgid "Restore"
 msgstr "還原"
 
-#: templates/index.php:33
+#: templates/index.php:31
 msgid "Deleted"
 msgstr "已刪除"
 
-#: templates/index.php:36 templates/index.php:37
+#: templates/index.php:34 templates/index.php:35
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/part.breadcrumb.php:9
+#: templates/part.breadcrumb.php:8
 msgid "Deleted Files"
 msgstr "已刪除的檔案"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 00281d2b6d..003cb69e59 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# v998 <keroro20054@gmail.com>, 2014
 # pellaeon <nfsmwlin@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,38 +19,38 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: private/app.php:243
+#: private/app.php:236
 #, php-format
 msgid ""
 "App \"%s\" can't be installed because it is not compatible with this version"
 " of ownCloud."
 msgstr "無法安裝應用程式 %s 因為它和此版本的 ownCloud 不相容。"
 
-#: private/app.php:255
+#: private/app.php:248
 msgid "No app name specified"
 msgstr "沒有指定應用程式名稱"
 
-#: private/app.php:360
+#: private/app.php:353
 msgid "Help"
 msgstr "說明"
 
-#: private/app.php:373
+#: private/app.php:366
 msgid "Personal"
 msgstr "個人"
 
-#: private/app.php:384
+#: private/app.php:377
 msgid "Settings"
 msgstr "設定"
 
-#: private/app.php:396
+#: private/app.php:389
 msgid "Users"
 msgstr "使用者"
 
-#: private/app.php:409
+#: private/app.php:402
 msgid "Admin"
 msgstr "管理"
 
-#: private/app.php:873
+#: private/app.php:875
 #, php-format
 msgid "Failed to upgrade \"%s\"."
 msgstr "升級失敗：%s"
@@ -62,15 +63,10 @@ msgstr "未知的檔案類型"
 msgid "Invalid image"
 msgstr "無效的圖片"
 
-#: private/defaults.php:34
+#: private/defaults.php:35
 msgid "web services under your control"
 msgstr "由您控制的網路服務"
 
-#: private/files.php:66 private/files.php:98
-#, php-format
-msgid "cannot open \"%s\""
-msgstr "無法開啓 %s"
-
 #: private/files.php:231
 msgid "ZIP download is turned off."
 msgstr "ZIP 下載已關閉。"
@@ -91,76 +87,80 @@ msgstr "選擇的檔案太大以致於無法產生壓縮檔。"
 msgid ""
 "Please download the files separately in smaller chunks or kindly ask your "
 "administrator."
-msgstr ""
+msgstr "請分割您的檔案後下載，或請詢問您的系統管理員。"
 
-#: private/installer.php:63
+#: private/installer.php:64
 msgid "No source specified when installing app"
 msgstr "沒有指定應用程式安裝來源"
 
-#: private/installer.php:70
+#: private/installer.php:71
 msgid "No href specified when installing app from http"
 msgstr "從 http 安裝應用程式，找不到 href 屬性"
 
-#: private/installer.php:75
+#: private/installer.php:76
 msgid "No path specified when installing app from local file"
 msgstr "從本地檔案安裝應用程式時沒有指定路徑"
 
-#: private/installer.php:89
+#: private/installer.php:90
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr "不支援 %s 格式的壓縮檔"
 
-#: private/installer.php:103
+#: private/installer.php:104
 msgid "Failed to open archive when installing app"
 msgstr "安裝應用程式時無法開啓壓縮檔"
 
-#: private/installer.php:125
+#: private/installer.php:126
 msgid "App does not provide an info.xml file"
 msgstr "應用程式沒有提供 info.xml 檔案"
 
-#: private/installer.php:131
+#: private/installer.php:132
 msgid "App can't be installed because of not allowed code in the App"
 msgstr "無法安裝應用程式因為在當中找到危險的代碼"
 
-#: private/installer.php:140
+#: private/installer.php:141
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr "無法安裝應用程式因為它和此版本的 ownCloud 不相容。"
 
-#: private/installer.php:146
+#: private/installer.php:147
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr "無法安裝應用程式，因為它包含了 <shipped>true</shipped> 標籤，在未發行的應用程式當中這是不允許的"
 
-#: private/installer.php:159
+#: private/installer.php:160
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
 msgstr "無法安裝應用程式，因為它在 info.xml/version 宣告的版本與 app store 當中記載的版本不同"
 
-#: private/installer.php:169
+#: private/installer.php:170
 msgid "App directory already exists"
 msgstr "應用程式目錄已經存在"
 
-#: private/installer.php:182
+#: private/installer.php:183
 #, php-format
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr "無法建立應用程式目錄，請檢查權限：%s"
 
-#: private/json.php:28
+#: private/json.php:29
 msgid "Application is not enabled"
 msgstr "應用程式未啟用"
 
-#: private/json.php:39 private/json.php:62 private/json.php:73
+#: private/json.php:40 private/json.php:63 private/json.php:88
 msgid "Authentication error"
 msgstr "認證錯誤"
 
-#: private/json.php:51
+#: private/json.php:52
 msgid "Token expired. Please reload page."
 msgstr "Token 過期，請重新整理頁面。"
 
+#: private/json.php:75
+msgid "Unknown user"
+msgstr ""
+
 #: private/search/provider/file.php:18 private/search/provider/file.php:36
 msgid "Files"
 msgstr "檔案"
@@ -200,8 +200,8 @@ msgid "You need to enter either an existing account or the administrator."
 msgstr "您必須輸入一個現有的帳號或管理員帳號。"
 
 #: private/setup/mysql.php:12
-msgid "MySQL username and/or password not valid"
-msgstr "MySQL 用戶名和/或密碼無效"
+msgid "MySQL/MariaDB username and/or password not valid"
+msgstr ""
 
 #: private/setup/mysql.php:67 private/setup/oci.php:54
 #: private/setup/oci.php:121 private/setup/oci.php:144
@@ -228,21 +228,21 @@ msgstr "有問題的指令是：\"%s\""
 
 #: private/setup/mysql.php:85
 #, php-format
-msgid "MySQL user '%s'@'localhost' exists already."
-msgstr "MySQL 使用者 '%s'@'localhost' 已經存在。"
+msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
+msgstr ""
 
 #: private/setup/mysql.php:86
-msgid "Drop this user from MySQL"
-msgstr "在 MySQL 移除這個使用者"
+msgid "Drop this user from MySQL/MariaDB"
+msgstr ""
 
 #: private/setup/mysql.php:91
 #, php-format
-msgid "MySQL user '%s'@'%%' already exists"
-msgstr "MySQL 使用者 '%s'@'%%' 已經存在"
+msgid "MySQL/MariaDB user '%s'@'%%' already exists"
+msgstr ""
 
 #: private/setup/mysql.php:92
-msgid "Drop this user from MySQL."
-msgstr "在 MySQL 移除這個使用者。"
+msgid "Drop this user from MySQL/MariaDB."
+msgstr ""
 
 #: private/setup/oci.php:34
 msgid "Oracle connection could not be established"
@@ -269,62 +269,68 @@ msgstr "設定管理員帳號。"
 msgid "Set an admin password."
 msgstr "設定管理員密碼。"
 
-#: private/setup.php:195
+#: private/setup.php:198
 msgid ""
 "Your web server is not yet properly setup to allow files synchronization "
 "because the WebDAV interface seems to be broken."
 msgstr "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。"
 
-#: private/setup.php:196
+#: private/setup.php:199
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr "請參考<a href='%s'>安裝指南</a>。"
 
-#: private/tags.php:194
+#: private/share/mailnotifications.php:73
+#: private/share/mailnotifications.php:119
+#, php-format
+msgid "%s shared »%s« with you"
+msgstr "%s 與您分享了 %s"
+
+#: private/tags.php:193
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr "找不到分類：\"%s\""
 
-#: private/template/functions.php:130
+#: private/template/functions.php:133
 msgid "seconds ago"
 msgstr "幾秒前"
 
-#: private/template/functions.php:131
+#: private/template/functions.php:134
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] "%n 分鐘前"
 
-#: private/template/functions.php:132
+#: private/template/functions.php:135
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] "%n 小時前"
 
-#: private/template/functions.php:133
+#: private/template/functions.php:136
 msgid "today"
 msgstr "今天"
 
-#: private/template/functions.php:134
+#: private/template/functions.php:137
 msgid "yesterday"
 msgstr "昨天"
 
-#: private/template/functions.php:136
+#: private/template/functions.php:139
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] "%n 天前"
 
-#: private/template/functions.php:138
+#: private/template/functions.php:141
 msgid "last month"
 msgstr "上個月"
 
-#: private/template/functions.php:139
+#: private/template/functions.php:142
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] "%n 個月前"
 
-#: private/template/functions.php:141
+#: private/template/functions.php:144
 msgid "last year"
 msgstr "去年"
 
-#: private/template/functions.php:142
+#: private/template/functions.php:145
 msgid "years ago"
 msgstr "幾年前"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 05744d16b7..963c82e52c 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-04 18:12-0500\n"
-"PO-Revision-Date: 2013-12-04 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-26 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 05:55+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,48 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: admin/controller.php:66
+#, php-format
+msgid "Invalid value supplied for %s"
+msgstr ""
+
+#: admin/controller.php:73
+msgid "Saved"
+msgstr ""
+
+#: admin/controller.php:90
+msgid "test email settings"
+msgstr ""
+
+#: admin/controller.php:91
+msgid "If you received this email, the settings seem to be correct."
+msgstr ""
+
+#: admin/controller.php:94
+msgid ""
+"A problem occurred while sending the e-mail. Please revisit your settings."
+msgstr ""
+
+#: admin/controller.php:99
+msgid "Email sent"
+msgstr "Email 已寄出"
+
+#: admin/controller.php:101
+msgid "You need to set your user email before being able to send test emails."
+msgstr ""
+
+#: admin/controller.php:116 templates/admin.php:299
+msgid "Send mode"
+msgstr ""
+
+#: admin/controller.php:118 templates/admin.php:312 templates/personal.php:159
+msgid "Encryption"
+msgstr "加密"
+
+#: admin/controller.php:120 templates/admin.php:336
+msgid "Authentication method"
+msgstr ""
+
 #: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "無法從 App Store 讀取清單"
@@ -114,62 +156,90 @@ msgstr "後端不支援變更密碼，但成功更新使用者的加密金鑰"
 msgid "Unable to change password"
 msgstr "無法修改密碼"
 
-#: js/apps.js:43
+#: js/admin.js:73
+msgid "Sending..."
+msgstr ""
+
+#: js/apps.js:45 templates/help.php:4
+msgid "User Documentation"
+msgstr "用戶說明文件"
+
+#: js/apps.js:50
+msgid "Admin Documentation"
+msgstr ""
+
+#: js/apps.js:67
 msgid "Update to {appversion}"
 msgstr "更新至 {appversion}"
 
-#: js/apps.js:49 js/apps.js:82 js/apps.js:110
+#: js/apps.js:73 js/apps.js:106 js/apps.js:134
 msgid "Disable"
 msgstr "停用"
 
-#: js/apps.js:49 js/apps.js:90 js/apps.js:103 js/apps.js:119
+#: js/apps.js:73 js/apps.js:114 js/apps.js:127 js/apps.js:143
 msgid "Enable"
 msgstr "啟用"
 
-#: js/apps.js:71
+#: js/apps.js:95
 msgid "Please wait...."
 msgstr "請稍候..."
 
-#: js/apps.js:79 js/apps.js:80 js/apps.js:101
+#: js/apps.js:103 js/apps.js:104 js/apps.js:125
 msgid "Error while disabling app"
 msgstr "停用應用程式錯誤"
 
-#: js/apps.js:100 js/apps.js:114 js/apps.js:115
+#: js/apps.js:124 js/apps.js:138 js/apps.js:139
 msgid "Error while enabling app"
 msgstr "啓用應用程式錯誤"
 
-#: js/apps.js:125
+#: js/apps.js:149
 msgid "Updating...."
 msgstr "更新中..."
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error while updating app"
 msgstr "更新應用程式錯誤"
 
-#: js/apps.js:128
+#: js/apps.js:152
 msgid "Error"
 msgstr "錯誤"
 
-#: js/apps.js:129 templates/apps.php:43
+#: js/apps.js:153 templates/apps.php:54
 msgid "Update"
 msgstr "更新"
 
-#: js/apps.js:132
+#: js/apps.js:156
 msgid "Updated"
 msgstr "已更新"
 
-#: js/personal.js:220
+#: js/personal.js:246
 msgid "Select a profile picture"
 msgstr "選擇大頭貼"
 
-#: js/personal.js:266
+#: js/personal.js:277
+msgid "Very weak password"
+msgstr ""
+
+#: js/personal.js:278
+msgid "Weak password"
+msgstr ""
+
+#: js/personal.js:279
+msgid "So-so password"
+msgstr ""
+
+#: js/personal.js:280
+msgid "Good password"
+msgstr ""
+
+#: js/personal.js:281
+msgid "Strong password"
+msgstr ""
+
+#: js/personal.js:316
 msgid "Decrypting files... Please wait, this can take some time."
 msgstr "檔案解密中，請稍候。"
 
-#: js/personal.js:287
-msgid "Saving..."
-msgstr "儲存中..."
-
 #: js/users.js:47
 msgid "deleted"
 msgstr "已刪除"
@@ -182,40 +252,40 @@ msgstr "復原"
 msgid "Unable to remove user"
 msgstr "無法刪除用戶"
 
-#: js/users.js:95 templates/users.php:26 templates/users.php:90
-#: templates/users.php:118
+#: js/users.js:101 templates/users.php:24 templates/users.php:88
+#: templates/users.php:116
 msgid "Groups"
 msgstr "群組"
 
-#: js/users.js:100 templates/users.php:92 templates/users.php:130
+#: js/users.js:105 templates/users.php:90 templates/users.php:128
 msgid "Group Admin"
 msgstr "群組管理員"
 
-#: js/users.js:123 templates/users.php:170
+#: js/users.js:127 templates/users.php:168
 msgid "Delete"
 msgstr "刪除"
 
-#: js/users.js:284
+#: js/users.js:310
 msgid "add group"
 msgstr "新增群組"
 
-#: js/users.js:451
+#: js/users.js:486
 msgid "A valid username must be provided"
 msgstr "必須提供一個有效的用戶名"
 
-#: js/users.js:452 js/users.js:458 js/users.js:473
+#: js/users.js:487 js/users.js:493 js/users.js:508
 msgid "Error creating user"
 msgstr "建立用戶時出現錯誤"
 
-#: js/users.js:457
+#: js/users.js:492
 msgid "A valid password must be provided"
 msgstr "一定要提供一個有效的密碼"
 
-#: js/users.js:481
+#: js/users.js:516
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr "警告：使用者 {user} 的家目錄已經存在"
 
-#: personal.php:45 personal.php:46
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -239,18 +309,42 @@ msgstr ""
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:22 templates/admin.php:36
+#: templates/admin.php:16 templates/admin.php:23
+msgid "None"
+msgstr "無"
+
+#: templates/admin.php:17
+msgid "Login"
+msgstr "登入"
+
+#: templates/admin.php:18
+msgid "Plain"
+msgstr ""
+
+#: templates/admin.php:19
+msgid "NT LAN Manager"
+msgstr ""
+
+#: templates/admin.php:24
+msgid "SSL"
+msgstr ""
+
+#: templates/admin.php:25
+msgid "TLS"
+msgstr ""
+
+#: templates/admin.php:47 templates/admin.php:61
 msgid "Security Warning"
 msgstr "安全性警告"
 
-#: templates/admin.php:25
+#: 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 ""
 
-#: templates/admin.php:39
+#: 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 "
@@ -259,68 +353,68 @@ msgid ""
 "root."
 msgstr "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。"
 
-#: templates/admin.php:50
+#: templates/admin.php:75
 msgid "Setup Warning"
 msgstr "設定警告"
 
-#: templates/admin.php:53
+#: 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:54
+#: 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:65
+#: templates/admin.php:90
 msgid "Module 'fileinfo' missing"
 msgstr "遺失 'fileinfo' 模組"
 
-#: templates/admin.php:68
+#: 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 "未偵測到 PHP 模組 'fileinfo'。我們強烈建議啟用這個模組以取得最好的 mime-type 支援。"
 
-#: templates/admin.php:79
+#: templates/admin.php:104
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:82
+#: 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 ""
 
-#: templates/admin.php:93
+#: templates/admin.php:118
 msgid "Locale not working"
 msgstr "語系無法運作"
 
-#: templates/admin.php:98
+#: templates/admin.php:123
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:102
+#: templates/admin.php:127
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:106
+#: 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 ""
 
-#: templates/admin.php:118
+#: templates/admin.php:143
 msgid "Internet connection not working"
 msgstr "無網際網路存取"
 
-#: templates/admin.php:121
+#: 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 "
@@ -329,118 +423,178 @@ msgid ""
 "internet connection for this server if you want to have all features."
 msgstr "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。"
 
-#: templates/admin.php:135
+#: templates/admin.php:160
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:142
+#: templates/admin.php:167
+#, php-format
+msgid "Last cron was executed at %s."
+msgstr ""
+
+#: templates/admin.php:170
+#, php-format
+msgid ""
+"Last cron was executed at %s. This is more than an hour ago, something seems"
+" wrong."
+msgstr ""
+
+#: templates/admin.php:174
+msgid "Cron was not executed yet!"
+msgstr ""
+
+#: templates/admin.php:184
 msgid "Execute one task with each page loaded"
 msgstr "當頁面載入時，執行"
 
-#: templates/admin.php:150
+#: templates/admin.php:192
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php"
 
-#: templates/admin.php:158
+#: templates/admin.php:200
 msgid "Use systems cron service to call the cron.php file every 15 minutes."
 msgstr "使用系統的 cron 服務每15分鐘呼叫 cron.php 一次"
 
-#: templates/admin.php:163
+#: templates/admin.php:205
 msgid "Sharing"
 msgstr "分享"
 
-#: templates/admin.php:169
+#: templates/admin.php:211
 msgid "Enable Share API"
 msgstr "啟用分享 API"
 
-#: templates/admin.php:170
+#: templates/admin.php:212
 msgid "Allow apps to use the Share API"
 msgstr "允許 apps 使用分享 API"
 
-#: templates/admin.php:177
+#: templates/admin.php:219
 msgid "Allow links"
 msgstr "允許連結"
 
-#: templates/admin.php:178
+#: templates/admin.php:220
 msgid "Allow users to share items to the public with links"
 msgstr "允許使用者以結連公開分享檔案"
 
-#: templates/admin.php:186
+#: templates/admin.php:227
 msgid "Allow public uploads"
 msgstr "允許任何人上傳"
 
-#: templates/admin.php:187
+#: templates/admin.php:228
 msgid ""
 "Allow users to enable others to upload into their publicly shared folders"
 msgstr "允許使用者將他們公開分享的資料夾設定為「任何人皆可上傳」"
 
-#: templates/admin.php:195
+#: templates/admin.php:235
 msgid "Allow resharing"
 msgstr "允許轉貼分享"
 
-#: templates/admin.php:196
+#: templates/admin.php:236
 msgid "Allow users to share items shared with them again"
 msgstr "允許使用者分享其他使用者分享給他的檔案"
 
-#: templates/admin.php:203
+#: templates/admin.php:243
 msgid "Allow users to share with anyone"
 msgstr "允許使用者與任何人分享檔案"
 
-#: templates/admin.php:206
+#: templates/admin.php:246
 msgid "Allow users to only share with users in their groups"
 msgstr "僅允許使用者在群組內分享"
 
-#: templates/admin.php:213
+#: templates/admin.php:253
 msgid "Allow mail notification"
 msgstr "允許郵件通知"
 
-#: templates/admin.php:214
+#: templates/admin.php:254
 msgid "Allow user to send mail notification for shared files"
 msgstr "允許使用者分享檔案時寄出通知郵件"
 
-#: templates/admin.php:221
+#: templates/admin.php:261
 msgid "Security"
 msgstr "安全性"
 
-#: templates/admin.php:234
+#: templates/admin.php:274
 msgid "Enforce HTTPS"
 msgstr "強制啟用 HTTPS"
 
-#: templates/admin.php:236
+#: templates/admin.php:276
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr "強迫用戶端使用加密連線連接到 %s"
 
-#: templates/admin.php:242
+#: templates/admin.php:282
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL "
 "enforcement."
 msgstr "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。"
 
-#: templates/admin.php:254
+#: templates/admin.php:294
+msgid "Email Server"
+msgstr ""
+
+#: templates/admin.php:296
+msgid "This is used for sending out notifications."
+msgstr ""
+
+#: templates/admin.php:327
+msgid "From address"
+msgstr ""
+
+#: templates/admin.php:349
+msgid "Authentication required"
+msgstr ""
+
+#: templates/admin.php:353
+msgid "Server address"
+msgstr "伺服器位址"
+
+#: templates/admin.php:357
+msgid "Port"
+msgstr "連接埠"
+
+#: templates/admin.php:362
+msgid "Credentials"
+msgstr "認證"
+
+#: templates/admin.php:363
+msgid "SMTP Username"
+msgstr ""
+
+#: templates/admin.php:366
+msgid "SMTP Password"
+msgstr ""
+
+#: templates/admin.php:370
+msgid "Test email settings"
+msgstr ""
+
+#: templates/admin.php:371
+msgid "Send email"
+msgstr ""
+
+#: templates/admin.php:376
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:255
+#: templates/admin.php:377
 msgid "Log level"
 msgstr "紀錄層級"
 
-#: templates/admin.php:287
+#: templates/admin.php:409
 msgid "More"
 msgstr "更多"
 
-#: templates/admin.php:288
+#: templates/admin.php:410
 msgid "Less"
 msgstr "更少"
 
-#: templates/admin.php:294 templates/personal.php:173
+#: templates/admin.php:416 templates/personal.php:181
 msgid "Version"
 msgstr "版本"
 
-#: templates/admin.php:298 templates/personal.php:176
+#: templates/admin.php:420 templates/personal.php:184
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" "
 "target=\"_blank\">ownCloud community</a>, the <a "
@@ -450,30 +604,34 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 授權許可下發布。"
 
-#: templates/apps.php:13
+#: templates/apps.php:14
 msgid "Add your App"
 msgstr "添加你的 App"
 
-#: templates/apps.php:28
+#: templates/apps.php:31
 msgid "More Apps"
 msgstr "更多Apps"
 
-#: templates/apps.php:33
+#: templates/apps.php:37
 msgid "Select an App"
 msgstr "選擇一個應用程式"
 
-#: templates/apps.php:39
+#: templates/apps.php:42
+msgid "Documentation:"
+msgstr ""
+
+#: templates/apps.php:48
 msgid "See application page at apps.owncloud.com"
 msgstr "查看應用程式頁面於 apps.owncloud.com"
 
-#: templates/apps.php:41
+#: templates/apps.php:50
+msgid "See application website"
+msgstr ""
+
+#: templates/apps.php:52
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>"
 
-#: templates/help.php:4
-msgid "User Documentation"
-msgstr "用戶說明文件"
-
 #: templates/help.php:6
 msgid "Administrator Documentation"
 msgstr "管理者說明文件"
@@ -507,7 +665,7 @@ msgstr "再次顯示首次使用精靈"
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>"
 
-#: templates/personal.php:39 templates/users.php:23 templates/users.php:89
+#: templates/personal.php:39 templates/users.php:21 templates/users.php:87
 msgid "Password"
 msgstr "密碼"
 
@@ -519,151 +677,149 @@ msgstr "你的密碼已更改"
 msgid "Unable to change your password"
 msgstr "無法變更您的密碼"
 
-#: templates/personal.php:42
+#: templates/personal.php:43
 msgid "Current password"
 msgstr "目前密碼"
 
-#: templates/personal.php:44
+#: templates/personal.php:46
 msgid "New password"
 msgstr "新密碼"
 
-#: templates/personal.php:46
+#: templates/personal.php:50
 msgid "Change password"
 msgstr "變更密碼"
 
-#: templates/personal.php:58 templates/users.php:88
+#: templates/personal.php:64 templates/users.php:86
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:73
+#: templates/personal.php:81
 msgid "Email"
 msgstr "信箱"
 
-#: templates/personal.php:75
+#: templates/personal.php:83
 msgid "Your email address"
 msgstr "您的電子郵件信箱"
 
-#: templates/personal.php:76
-msgid "Fill in an email address to enable password recovery"
-msgstr "請填入電子郵件信箱以便回復密碼"
-
 #: templates/personal.php:86
+msgid ""
+"Fill in an email address to enable password recovery and receive "
+"notifications"
+msgstr ""
+
+#: templates/personal.php:96
 msgid "Profile picture"
 msgstr "個人資料照片"
 
-#: templates/personal.php:91
+#: templates/personal.php:101
 msgid "Upload new"
 msgstr "上傳新的"
 
-#: templates/personal.php:93
+#: templates/personal.php:103
 msgid "Select new from Files"
 msgstr "從已上傳的檔案中選一個"
 
-#: templates/personal.php:94
+#: templates/personal.php:104
 msgid "Remove image"
 msgstr "移除圖片"
 
-#: templates/personal.php:95
+#: templates/personal.php:105
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它"
 
-#: templates/personal.php:97
+#: templates/personal.php:107
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:101
-msgid "Abort"
-msgstr "中斷"
+#: templates/personal.php:111
+msgid "Cancel"
+msgstr "取消"
 
-#: templates/personal.php:102
+#: templates/personal.php:112
 msgid "Choose as profile image"
 msgstr "設定為大頭貼"
 
-#: templates/personal.php:110 templates/personal.php:111
+#: templates/personal.php:120 templates/personal.php:121
 msgid "Language"
 msgstr "語言"
 
-#: templates/personal.php:130
+#: templates/personal.php:140
 msgid "Help translate"
 msgstr "幫助翻譯"
 
-#: templates/personal.php:137
+#: templates/personal.php:147
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: templates/personal.php:139
+#: templates/personal.php:149
 #, php-format
 msgid ""
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
 "WebDAV</a>"
 msgstr "使用這個地址<a href=\"%s\" target=\"_blank\">來透過 WebDAV 存取檔案</a>"
 
-#: templates/personal.php:150
-msgid "Encryption"
-msgstr "加密"
-
-#: templates/personal.php:152
+#: templates/personal.php:161
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:158
+#: templates/personal.php:167
 msgid "Log-in password"
 msgstr "登入密碼"
 
-#: templates/personal.php:163
+#: templates/personal.php:172
 msgid "Decrypt all Files"
 msgstr "解密所有檔案"
 
-#: templates/users.php:21
+#: templates/users.php:19
 msgid "Login Name"
 msgstr "登入名稱"
 
-#: templates/users.php:30
+#: templates/users.php:28
 msgid "Create"
 msgstr "建立"
 
-#: templates/users.php:36
+#: templates/users.php:34
 msgid "Admin Recovery Password"
 msgstr "管理者復原密碼"
 
-#: templates/users.php:37 templates/users.php:38
+#: templates/users.php:35 templates/users.php:36
 msgid ""
 "Enter the recovery password in order to recover the users files during "
 "password change"
 msgstr "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼"
 
-#: templates/users.php:42
+#: templates/users.php:40
 msgid "Default Storage"
 msgstr "預設儲存區"
 
-#: templates/users.php:44 templates/users.php:139
+#: templates/users.php:42 templates/users.php:137
 msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
 msgstr ""
 
-#: templates/users.php:48 templates/users.php:148
+#: templates/users.php:46 templates/users.php:146
 msgid "Unlimited"
 msgstr "無限制"
 
-#: templates/users.php:66 templates/users.php:163
+#: templates/users.php:64 templates/users.php:161
 msgid "Other"
 msgstr "其他"
 
-#: templates/users.php:87
+#: templates/users.php:85
 msgid "Username"
 msgstr "使用者名稱"
 
-#: templates/users.php:94
+#: templates/users.php:92
 msgid "Storage"
 msgstr "儲存區"
 
-#: templates/users.php:108
+#: templates/users.php:106
 msgid "change full name"
 msgstr ""
 
-#: templates/users.php:112
+#: templates/users.php:110
 msgid "set new password"
 msgstr "設定新密碼"
 
-#: templates/users.php:143
+#: templates/users.php:141
 msgid "Default"
 msgstr "預設"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 5eca45754e..f025e58cce 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2013-12-20 01:55-0500\n"
-"PO-Revision-Date: 2013-12-20 06:23+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2014-03-27 01:55-0400\n"
+"PO-Revision-Date: 2014-03-26 06:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,43 +88,43 @@ msgstr "成功"
 msgid "Error"
 msgstr "錯誤"
 
-#: js/settings.js:837
+#: js/settings.js:838
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:846
+#: js/settings.js:847
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:855
+#: js/settings.js:856
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:872 js/settings.js:881
+#: js/settings.js:873 js/settings.js:882
 msgid "Select groups"
 msgstr "選擇群組"
 
-#: js/settings.js:875 js/settings.js:884
+#: js/settings.js:876 js/settings.js:885
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:878
+#: js/settings.js:879
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:905
+#: js/settings.js:906
 msgid "Connection test succeeded"
 msgstr "連線測試成功"
 
-#: js/settings.js:912
+#: js/settings.js:913
 msgid "Connection test failed"
 msgstr "連線測試失敗"
 
-#: js/settings.js:921
+#: js/settings.js:922
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr "您真的要刪除現在的伺服器設定嗎？"
 
-#: js/settings.js:922
+#: js/settings.js:923
 msgid "Confirm Deletion"
 msgstr "確認刪除"
 
@@ -140,11 +140,11 @@ msgid "%s user found"
 msgid_plural "%s users found"
 msgstr[0] ""
 
-#: lib/wizard.php:778 lib/wizard.php:790
+#: lib/wizard.php:784 lib/wizard.php:796
 msgid "Invalid Host"
 msgstr ""
 
-#: lib/wizard.php:951
+#: lib/wizard.php:963
 msgid "Could not find the desired feature"
 msgstr ""
 
@@ -162,7 +162,7 @@ msgstr "說明"
 
 #: templates/part.wizard-groupfilter.php:4
 #, php-format
-msgid "Limit the access to %s to groups meeting this criteria:"
+msgid "Groups meeting these criteria are available in %s:"
 msgstr ""
 
 #: templates/part.wizard-groupfilter.php:8
@@ -198,7 +198,7 @@ msgid "groups found"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:4
-msgid "What attribute shall be used as login name:"
+msgid "Users login with this attribute:"
 msgstr ""
 
 #: templates/part.wizard-loginfilter.php:8
@@ -266,7 +266,7 @@ msgstr "您可以在進階標籤頁裡面指定使用者及群組的 Base DN"
 
 #: templates/part.wizard-userfilter.php:4
 #, php-format
-msgid "Limit the access to %s to users meeting this criteria:"
+msgid "Limit %s access to users meeting these criteria:"
 msgstr ""
 
 #: templates/part.wizard-userfilter.php:31
@@ -409,41 +409,51 @@ msgstr "Group Search Attributes"
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:40
+#: templates/settings.php:39
+msgid "Nested Groups"
+msgstr ""
+
+#: templates/settings.php:39
+msgid ""
+"When switched on, groups that contain groups are supported. (Only works if "
+"the group member attribute contains DNs.)"
+msgstr ""
+
+#: templates/settings.php:41
 msgid "Special Attributes"
 msgstr "特殊屬性"
 
-#: templates/settings.php:42
+#: templates/settings.php:43
 msgid "Quota Field"
 msgstr "配額欄位"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "Quota Default"
 msgstr "預設配額"
 
-#: templates/settings.php:43
+#: templates/settings.php:44
 msgid "in bytes"
 msgstr "以位元組為單位"
 
-#: templates/settings.php:44
+#: templates/settings.php:45
 msgid "Email Field"
 msgstr "電郵欄位"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid "User Home Folder Naming Rule"
 msgstr "使用者家目錄的命名規則"
 
-#: templates/settings.php:45
+#: templates/settings.php:46
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。"
 
-#: templates/settings.php:51
+#: templates/settings.php:52
 msgid "Internal Username"
 msgstr "內部使用者名稱"
 
-#: templates/settings.php:52
+#: templates/settings.php:53
 msgid ""
 "By default the internal username will be created from the UUID attribute. It"
 " makes sure that the username is unique and characters do not need to be "
@@ -459,15 +469,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:54
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:55
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:56
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute"
 " is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -478,19 +488,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:57
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:58
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:59
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:60
 msgid ""
 "Usernames are used to store and assign (meta) data. In order to precisely "
 "identify and recognize users, each LDAP user will have a internal username. "
@@ -504,10 +514,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:61
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/lib/base.php b/lib/base.php
index 49cbb1279d..15a3ec8bc8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -73,11 +73,6 @@ class OC {
 	 */
 	public static $CLI = false;
 
-	/**
-	 * @var OC_Router
-	 */
-	protected static $router = null;
-
 	/**
 	 * @var \OC\Session\Session
 	 */
@@ -103,7 +98,9 @@ class OC {
 			get_include_path()
 		);
 
-		if(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
+		if(defined('PHPUNIT_CONFIG_DIR')) {
+			self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/';
+		} elseif(defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) {
 			self::$configDir = OC::$SERVERROOT . '/tests/config/';
 		} else {
 			self::$configDir = OC::$SERVERROOT . '/config/';
@@ -316,7 +313,6 @@ class OC {
 		OC_Util::addScript("config");
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search', 'result');
-		OC_Util::addScript('router');
 		OC_Util::addScript("oc-requesttoken");
 
 		// avatars
@@ -388,19 +384,6 @@ class OC {
 		return OC_Config::getValue('session_lifetime', 60 * 60 * 24);
 	}
 
-	/**
-	 * @return OC_Router
-	 */
-	public static function getRouter() {
-		if (!isset(OC::$router)) {
-			OC::$router = new OC_Router();
-			OC::$router->loadRoutes();
-		}
-
-		return OC::$router;
-	}
-
-
 	public static function loadAppClassPaths() {
 		foreach (OC_APP::getEnabledApps() as $app) {
 			$file = OC_App::getAppPath($app) . '/appinfo/classpath.php';
@@ -537,6 +520,7 @@ class OC {
 					echo $error['hint'] . "\n\n";
 				}
 			} else {
+				OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
 				OC_Template::printGuestPage('', 'error', array('errors' => $errors));
 			}
 			exit;
@@ -554,7 +538,8 @@ class OC {
 		OC_User::useBackend(new OC_User_Database());
 		OC_Group::useBackend(new OC_Group_Database());
 
-		if (isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('loginname')
+		$basic_auth = OC_Config::getValue('basic_auth', true);
+		if ($basic_auth && isset($_SERVER['PHP_AUTH_USER']) && self::$session->exists('loginname')
 			&& $_SERVER['PHP_AUTH_USER'] !== self::$session->get('loginname')) {
 			$sessionUser = self::$session->get('loginname');
 			$serverUser = $_SERVER['PHP_AUTH_USER'];
@@ -564,16 +549,10 @@ class OC {
 			OC_User::logout();
 		}
 
-		// Load Apps
-		// This includes plugins for users and filesystems as well
-		global $RUNTIME_NOAPPS;
-		global $RUNTIME_APPTYPES;
-		if (!$RUNTIME_NOAPPS && !self::checkUpgrade(false)) {
-			if ($RUNTIME_APPTYPES) {
-				OC_App::loadApps($RUNTIME_APPTYPES);
-			} else {
-				OC_App::loadApps();
-			}
+		// Load minimum set of apps - which is filesystem, authentication and logging
+		if (!self::checkUpgrade(false)) {
+			OC_App::loadApps(array('authentication'));
+			OC_App::loadApps(array('filesystem', 'logging'));
 		}
 
 		//setup extra user backends
@@ -661,7 +640,10 @@ class OC {
 	 */
 	public static function registerPreviewHooks() {
 		OC_Hook::connect('OC_Filesystem', 'post_write', 'OC\Preview', 'post_write');
-		OC_Hook::connect('OC_Filesystem', 'delete', 'OC\Preview', 'post_delete');
+		OC_Hook::connect('OC_Filesystem', 'preDelete', 'OC\Preview', 'prepare_delete_files');
+		OC_Hook::connect('\OCP\Versions', 'preDelete', 'OC\Preview', 'prepare_delete');
+		OC_Hook::connect('\OCP\Trashbin', 'preDelete', 'OC\Preview', 'prepare_delete');
+		OC_Hook::connect('OC_Filesystem', 'delete', 'OC\Preview', 'post_delete_files');
 		OC_Hook::connect('\OCP\Versions', 'delete', 'OC\Preview', 'post_delete');
 		OC_Hook::connect('\OCP\Trashbin', 'delete', 'OC\Preview', 'post_delete');
 	}
@@ -671,10 +653,10 @@ class OC {
 	 */
 	public static function registerShareHooks() {
 		if (\OC_Config::getValue('installed')) {
-			OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
-			OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
-			OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
-			OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
+			OC_Hook::connect('OC_User', 'post_deleteUser', 'OC\Share\Hooks', 'post_deleteUser');
+			OC_Hook::connect('OC_User', 'post_addToGroup', 'OC\Share\Hooks', 'post_addToGroup');
+			OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OC\Share\Hooks', 'post_removeFromGroup');
+			OC_Hook::connect('OC_User', 'post_deleteGroup', 'OC\Share\Hooks', 'post_deleteGroup');
 		}
 	}
 
@@ -693,6 +675,22 @@ class OC {
 			exit();
 		}
 
+		$host = OC_Request::insecureServerHost();
+		// if the host passed in headers isn't trusted
+		if (!OC::$CLI
+			// overwritehost is always trusted
+			&& OC_Request::getOverwriteHost() === null
+			&& !OC_Request::isTrustedDomain($host)) {
+
+			header('HTTP/1.1 400 Bad Request');
+			header('Status: 400 Bad Request');
+			OC_Template::printErrorPage(
+				'You are accessing the server from an untrusted domain.',
+				'Please contact your administrator'
+			);
+			return;
+		}
+
 		$request = OC_Request::getPathInfo();
 		if (substr($request, -3) !== '.js') { // we need these files during the upgrade
 			self::checkMaintenanceMode();
@@ -708,7 +706,7 @@ class OC {
 					OC_App::loadApps();
 				}
 				self::checkSingleUserMode();
-				OC::getRouter()->match(OC_Request::getRawPathInfo());
+				OC::$server->getRouter()->match(OC_Request::getRawPathInfo());
 				return;
 			} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
 				//header('HTTP/1.0 404 Not Found');
@@ -847,7 +845,7 @@ class OC {
 		) {
 			return false;
 		}
-		OC_App::loadApps(array('authentication'));
+
 		if (defined("DEBUG") && DEBUG) {
 			OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
 		}
@@ -919,7 +917,7 @@ class OC {
 		) {
 			return false;
 		}
-		OC_App::loadApps(array('authentication'));
+
 		if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
 			//OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
 			OC_User::unsetMagicInCookie();
@@ -930,11 +928,6 @@ class OC {
 
 }
 
-// define runtime variables - unless this already has been done
-if (!isset($RUNTIME_NOAPPS)) {
-	$RUNTIME_NOAPPS = false;
-}
-
 if (!function_exists('get_temp_dir')) {
 	function get_temp_dir() {
 		if ($temp = ini_get('upload_tmp_dir')) return $temp;
@@ -953,4 +946,3 @@ if (!function_exists('get_temp_dir')) {
 }
 
 OC::init();
-
diff --git a/lib/l10n/am_ET.php b/lib/l10n/am_ET.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/am_ET.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 6870c54994..6287a53d61 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -1,18 +1,29 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "برنامج \"%s\" لا يمكن تثبيته بسبب انه لا يتناسب مع الاصدار الخاص بـ ownCloud.",
+"No app name specified" => "لا يوجد برنامج بهذا الاسم",
 "Help" => "المساعدة",
 "Personal" => "شخصي",
 "Settings" => "إعدادات",
 "Users" => "المستخدمين",
 "Admin" => "المدير",
+"Failed to upgrade \"%s\"." => "خطا في ترقية \"%s\".",
+"Unknown filetype" => "نوع الملف غير معروف",
+"Invalid image" => "الصورة غير صالحة",
 "web services under your control" => "خدمات الشبكة تحت سيطرتك",
 "ZIP download is turned off." => "تحميل ملفات ZIP متوقف",
 "Files need to be downloaded one by one." => "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر",
 "Back to Files" => "العودة الى الملفات",
 "Selected files too large to generate zip file." => "الملفات المحددة كبيرة جدا ليتم ضغطها في ملف zip",
+"No source specified when installing app" => "لم يتم تحديد المصدر عن تثبيت البرنامج",
+"Archives of type %s are not supported" => "الأرشيفات من نوع  %s غير مدعومة",
+"App does not provide an info.xml file" => "التطبيق لا يتوفر على ملف info.xml",
+"App directory already exists" => "مجلد التطبيق موجود مسبقا",
+"Can't create app folder. Please fix permissions. %s" => "لا يمكن إنشاء مجلد التطبيق. يرجى تعديل الصلاحيات. %s",
 "Application is not enabled" => "التطبيق غير مفعّل",
 "Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
 "Token expired. Please reload page." => "انتهت صلاحية الكلمة , يرجى اعادة تحميل الصفحة",
+"Unknown user" => "المستخدم غير معروف",
 "Files" => "الملفات",
 "Text" => "معلومات إضافية",
 "Images" => "صور",
@@ -21,13 +32,12 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s لا يسمح لك باستخدام نقطه (.) في اسم قاعدة البيانات",
 "MS SQL username and/or password not valid: %s" => "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s",
 "You need to enter either an existing account or the administrator." => "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير.",
-"MySQL username and/or password not valid" => "اسم المستخدم  و/أو  كلمة المرور لنظام MySQL غير صحيح",
+"MySQL/MariaDB username and/or password not valid" => "اسم مستخدم أو كلمة مرور MySQL/MariaDB  غير صحيحين",
 "DB Error: \"%s\"" => "خطأ في قواعد البيانات : \"%s\"",
 "Offending command was: \"%s\"" => "الأمر المخالف كان : \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "أسم المستخدم  '%s'@'localhost' الخاص بـ MySQL موجود مسبقا",
-"Drop this user from MySQL" => "احذف اسم المستخدم هذا من الـ MySQL",
-"MySQL user '%s'@'%%' already exists" => "أسم المستخدم  '%s'@'%%' الخاص بـ MySQL موجود مسبقا",
-"Drop this user from MySQL." => "احذف اسم المستخدم هذا من الـ MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "مستخدم MySQL/MariaDB '%s'@'localhost' موجود مسبقا",
+"Drop this user from MySQL/MariaDB." => "حذف هذا المستخدم من MySQL/MariaDB",
+"Oracle connection could not be established" => "لم تنجح محاولة اتصال Oracle",
 "Oracle username and/or password not valid" => "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح",
 "Offending command was: \"%s\", name: %s, password: %s" => "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
 "PostgreSQL username and/or password not valid" => "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
@@ -35,6 +45,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "اعداد كلمة مرور للمدير",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
 "Please double check the <a href='%s'>installation guides</a>." => "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
+"%s shared »%s« with you" => "%s شارك »%s« معك",
 "Could not find category \"%s\"" => "تعذر العثور على المجلد \"%s\"",
 "seconds ago" => "منذ ثواني",
 "_%n minute ago_::_%n minutes ago_" => array("","","","","",""),
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index c9de3d64d8..f29120e60e 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -21,13 +21,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s, не можете да ползвате точки в името на базата от данни",
 "MS SQL username and/or password not valid: %s" => "Невалидно MS SQL потребителско име и/или парола: %s",
 "You need to enter either an existing account or the administrator." => "Необходимо е да влезете в всъществуващ акаунт или като администратора",
-"MySQL username and/or password not valid" => "Невалидно MySQL потребителско име и/или парола",
 "DB Error: \"%s\"" => "Грешка в базата от данни: \"%s\"",
 "Offending command was: \"%s\"" => "Проблемната команда беше: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL потребителят '%s'@'localhost' вече съществува",
-"Drop this user from MySQL" => "Изтриване на потребителя от MySQL",
-"MySQL user '%s'@'%%' already exists" => "MySQL потребителят  '%s'@'%%' вече съществува.",
-"Drop this user from MySQL." => "Изтриване на потребителя от MySQL.",
 "Oracle connection could not be established" => "Oracle връзка не можа да се осъществи",
 "Oracle username and/or password not valid" => "Невалидно Oracle потребителско име и/или парола",
 "Offending command was: \"%s\", name: %s, password: %s" => "Проблемната команда беше: \"%s\", име: %s, парола: %s",
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 4755392d27..88bb8ec9ee 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Tipus de fitxer desconegut",
 "Invalid image" => "Imatge no vàlida",
 "web services under your control" => "controleu els vostres serveis web",
-"cannot open \"%s\"" => "no es pot obrir \"%s\"",
 "ZIP download is turned off." => "La baixada en ZIP està desactivada.",
 "Files need to be downloaded one by one." => "Els fitxers s'han de baixar d'un en un.",
 "Back to Files" => "Torna a Fitxers",
@@ -32,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",
@@ -40,13 +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 username and/or password not valid" => "Nom d'usuari i/o contrasenya MySQL no vàlids",
+"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 user '%s'@'localhost' exists already." => "L'usuari MySQL '%s'@'localhost' ja existeix.",
-"Drop this user from MySQL" => "Elimina aquest usuari de MySQL",
-"MySQL user '%s'@'%%' already exists" => "L'usuari MySQL '%s'@'%%' ja existeix",
-"Drop this user from MySQL." => "Elimina aquest usuari de MySQL.",
+"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",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Establiu una contrasenya per l'administrador.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El servidor web no està configurat correctament per permetre la sincronització de fitxers perquè la interfície WebDAV sembla no funcionar correctament.",
 "Please double check the <a href='%s'>installation guides</a>." => "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
+"%s shared »%s« with you" => "%s ha compartit »%s« amb tu",
 "Could not find category \"%s\"" => "No s'ha trobat la categoria \"%s\"",
 "seconds ago" => "segons enrere",
 "_%n minute ago_::_%n minutes ago_" => array("fa %n minut","fa %n minuts"),
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index df3a47b5ae..6b5c8441ca 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Neznámý typ souboru",
 "Invalid image" => "Chybný obrázek",
 "web services under your control" => "webové služby pod Vaší kontrolou",
-"cannot open \"%s\"" => "nelze otevřít \"%s\"",
 "ZIP download is turned off." => "Stahování v ZIPu je vypnuto.",
 "Files need to be downloaded one by one." => "Soubory musí být stahovány jednotlivě.",
 "Back to Files" => "Zpět k souborům",
@@ -32,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",
@@ -40,13 +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 username and/or password not valid" => "Uživatelské jméno či heslo MySQL není platné",
+"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 user '%s'@'localhost' exists already." => "Uživatel '%s'@'localhost' již v MySQL existuje.",
-"Drop this user from MySQL" => "Zrušte tohoto uživatele z MySQL",
-"MySQL user '%s'@'%%' already exists" => "Uživatel '%s'@'%%' již v MySQL existuje",
-"Drop this user from MySQL." => "Zrušte tohoto uživatele z MySQL",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB uživatel '%s'@'localhost' již existuje.",
+"Drop this user from MySQL/MariaDB" => "Smazat tohoto uživatele z MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB uživatel '%s'@'%%' již existuje",
+"Drop this user from MySQL/MariaDB." => "Smazat tohoto 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",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Zadejte heslo správce.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, rozhraní WebDAV se zdá být rozbité.",
 "Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
+"%s shared »%s« with you" => "%s s vámi sdílí »%s«",
 "Could not find category \"%s\"" => "Nelze nalézt kategorii \"%s\"",
 "seconds ago" => "před pár sekundami",
 "_%n minute ago_::_%n minutes ago_" => array("před %n minutou","před %n minutami","před %n minutami"),
diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php
index 0a52f5df77..57cb02653f 100644
--- a/lib/l10n/cy_GB.php
+++ b/lib/l10n/cy_GB.php
@@ -21,13 +21,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s does dim hawl defnyddio dot yn enw'r gronfa ddata",
 "MS SQL username and/or password not valid: %s" => "Enw a/neu gyfrinair MS SQL annilys: %s",
 "You need to enter either an existing account or the administrator." => "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr.",
-"MySQL username and/or password not valid" => "Enw a/neu gyfrinair MySQL annilys",
 "DB Error: \"%s\"" => "Gwall DB: \"%s\"",
 "Offending command was: \"%s\"" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Defnyddiwr MySQL '%s'@'localhost' yn bodoli eisoes.",
-"Drop this user from MySQL" => "Gollwng y defnyddiwr hwn o MySQL",
-"MySQL user '%s'@'%%' already exists" => "Defnyddiwr MySQL '%s'@'%%' eisoes yn bodoli",
-"Drop this user from MySQL." => "Gollwng y defnyddiwr hwn o MySQL.",
 "Oracle username and/or password not valid" => "Enw a/neu gyfrinair Oracle annilys",
 "Offending command was: \"%s\", name: %s, password: %s" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s",
 "PostgreSQL username and/or password not valid" => "Enw a/neu gyfrinair PostgreSQL annilys",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 65eb7466b6..c316600072 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Ukendt filtype",
 "Invalid image" => "Ugyldigt billede",
 "web services under your control" => "Webtjenester under din kontrol",
-"cannot open \"%s\"" => "Kan ikke åbne \"%s\"",
 "ZIP download is turned off." => "ZIP-download er slået fra.",
 "Files need to be downloaded one by one." => "Filer skal downloades en for en.",
 "Back to Files" => "Tilbage til Filer",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Programmet er ikke aktiveret",
 "Authentication error" => "Adgangsfejl",
 "Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.",
+"Unknown user" => "Ukendt bruger",
 "Files" => "Filer",
 "Text" => "SMS",
 "Images" => "Billeder",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s du må ikke bruge punktummer i databasenavnet.",
 "MS SQL username and/or password not valid: %s" => "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s",
 "You need to enter either an existing account or the administrator." => "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator.",
-"MySQL username and/or password not valid" => "MySQL brugernavn og/eller kodeord er ikke gyldigt.",
+"MySQL/MariaDB username and/or password not valid" => "Ugyldigt MySQL/MariaDB brugernavn og/eller kodeord ",
 "DB Error: \"%s\"" => "Databasefejl: \"%s\"",
 "Offending command was: \"%s\"" => "Fejlende kommando var: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL brugeren '%s'@'localhost' eksisterer allerede.",
-"Drop this user from MySQL" => "Slet denne bruger fra MySQL",
-"MySQL user '%s'@'%%' already exists" => "MySQL brugeren '%s'@'%%' eksisterer allerede.",
-"Drop this user from MySQL." => "Slet denne bruger fra MySQL",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB bruger '%s'@'localhost' eksistere allerede.",
+"Drop this user from MySQL/MariaDB" => "Slet denne bruger fra MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB bruger '%s'@'%%' eksistere allerede",
+"Drop this user from MySQL/MariaDB." => "Drop denne bruger fra MySQL/MariaDB.",
 "Oracle connection could not be established" => "Oracle forbindelsen kunne ikke etableres",
 "Oracle username and/or password not valid" => "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fejlende kommando var: \"%s\", navn: %s, password: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Angiv et admin kodeord.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
+"%s shared »%s« with you" => "%s delte »%s« med sig",
 "Could not find category \"%s\"" => "Kunne ikke finde kategorien \"%s\"",
 "seconds ago" => "sekunder siden",
 "_%n minute ago_::_%n minutes ago_" => array("%n minut siden","%n minutter siden"),
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index b1045892fb..d644582b91 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Unbekannter Dateityp",
 "Invalid image" => "Ungültiges Bild",
 "web services under your control" => "Web-Services unter Deiner Kontrolle",
-"cannot open \"%s\"" => "Öffnen von \"%s\" fehlgeschlagen",
 "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
 "Back to Files" => "Zurück zu \"Dateien\"",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
+"Unknown user" => "Unbekannter Benutzer",
 "Files" => "Dateien",
 "Text" => "Text",
 "Images" => "Bilder",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
 "MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Password ungültig: %s",
 "You need to enter either an existing account or the administrator." => "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-"MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig",
 "DB Error: \"%s\"" => "DB Fehler: \"%s\"",
 "Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.",
-"Drop this user from MySQL" => "Lösche diesen Benutzer von MySQL",
-"MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
-"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits.",
+"Drop this user from MySQL/MariaDB" => "Lösche diesen Benutzer von MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits",
+"Drop this user from MySQL/MariaDB." => "Lösche diesen Benutzer von MySQL/MariaDB.",
 "Oracle connection could not be established" => "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt werden",
 "Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Setze Administrator Passwort",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
+"%s shared »%s« with you" => "%s teilte »%s« mit Dir",
 "Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden.",
 "seconds ago" => "Gerade eben",
 "_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
diff --git a/lib/l10n/de_AT.php b/lib/l10n/de_AT.php
index 15f78e0bce..18e8e8b51b 100644
--- a/lib/l10n/de_AT.php
+++ b/lib/l10n/de_AT.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Personal" => "Persönlich",
+"Settings" => "Einstellungen",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
 "_%n day go_::_%n days ago_" => array("",""),
diff --git a/lib/l10n/de_CH.php b/lib/l10n/de_CH.php
index 7325aad931..fe1a519ccf 100644
--- a/lib/l10n/de_CH.php
+++ b/lib/l10n/de_CH.php
@@ -9,7 +9,6 @@ $TRANSLATIONS = array(
 "Admin" => "Administrator",
 "Failed to upgrade \"%s\"." => "Konnte \"%s\" nicht aktualisieren.",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
-"cannot open \"%s\"" => "Öffnen von \"%s\" fehlgeschlagen",
 "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
 "Back to Files" => "Zurück zu \"Dateien\"",
@@ -27,13 +26,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
 "MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungültig: %s",
 "You need to enter either an existing account or the administrator." => "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-"MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
 "DB Error: \"%s\"" => "DB Fehler: \"%s\"",
 "Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.",
-"Drop this user from MySQL" => "Lösche diesen Benutzer aus MySQL",
-"MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
-"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
 "Oracle connection could not be established" => "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
 "Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
@@ -42,6 +36,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Setze Administrator Passwort",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+"%s shared »%s« with you" => "%s teilt »%s« mit Ihnen",
 "Could not find category \"%s\"" => "Die Kategorie «%s» konnte nicht gefunden werden.",
 "seconds ago" => "Gerade eben",
 "_%n minute ago_::_%n minutes ago_" => array("","Vor %n Minuten"),
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 1a1c9783f4..85ed7e5c80 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Unbekannter Dateityp",
 "Invalid image" => "Ungültiges Bild",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
-"cannot open \"%s\"" => "Öffnen von \"%s\" fehlgeschlagen",
 "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
 "Back to Files" => "Zurück zu \"Dateien\"",
@@ -22,7 +21,7 @@ $TRANSLATIONS = array(
 "No path specified when installing app from local file" => "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
 "Archives of type %s are not supported" => "Archive des Typs %s werden nicht unterstützt.",
 "Failed to open archive when installing app" => "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
-"App does not provide an info.xml file" => "Die Applikation enthält keine info,xml Datei",
+"App does not provide an info.xml file" => "Die Applikation enthält keine info.xml Datei",
 "App can't be installed because of not allowed code in the App" => "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden",
 "App can't be installed because it is not compatible with this version of ownCloud" => "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
 "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
+"Unknown user" => "Unbekannter Benutzer",
 "Files" => "Dateien",
 "Text" => "Text",
 "Images" => "Bilder",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s Der Datenbank-Name darf keine Punkte enthalten",
 "MS SQL username and/or password not valid: %s" => "MS SQL Benutzername und/oder Passwort ungültig: %s",
 "You need to enter either an existing account or the administrator." => "Sie müssen entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-"MySQL username and/or password not valid" => "MySQL Benutzername und/oder Passwort ungültig",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig",
 "DB Error: \"%s\"" => "DB Fehler: \"%s\"",
 "Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL Benutzer '%s'@'localhost' existiert bereits.",
-"Drop this user from MySQL" => "Lösche diesen Benutzer aus MySQL",
-"MySQL user '%s'@'%%' already exists" => "MySQL Benutzer '%s'@'%%' existiert bereits",
-"Drop this user from MySQL." => "Lösche diesen Benutzer aus MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits.",
+"Drop this user from MySQL/MariaDB" => "Löschen Sie diesen Benutzer von MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits",
+"Drop this user from MySQL/MariaDB." => "Löschen Sie diesen Benutzer von MySQL/MariaDB.",
 "Oracle connection could not be established" => "Die Oracle-Verbindung konnte nicht aufgebaut werden.",
 "Oracle username and/or password not valid" => "Oracle Benutzername und/oder Passwort ungültig",
 "Offending command was: \"%s\", name: %s, password: %s" => "Fehlerhafter Befehl war: \"%s\", Name: %s, Passwort: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Setze Administrator Passwort",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+"%s shared »%s« with you" => "%s hat »%s« mit Ihnen geteilt",
 "Could not find category \"%s\"" => "Die Kategorie \"%s\" konnte nicht gefunden werden.",
 "seconds ago" => "Gerade eben",
 "_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 7f7797bbc7..148b7fc1fe 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Άγνωστος τύπος αρχείου",
 "Invalid image" => "Μη έγκυρη εικόνα",
 "web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
-"cannot open \"%s\"" => "αδυναμία ανοίγματος \"%s\"",
 "ZIP download is turned off." => "Η λήψη ZIP απενεργοποιήθηκε.",
 "Files need to be downloaded one by one." => "Τα αρχεία πρέπει να ληφθούν ένα-ένα.",
 "Back to Files" => "Πίσω στα Αρχεία",
@@ -25,12 +24,14 @@ $TRANSLATIONS = array(
 "App does not provide an info.xml file" => "Η εφαρμογή δεν παρέχει αρχείο info.xml",
 "App can't be installed because of not allowed code in the App" => "Η εφαρμογή δεν μπορεί να εγκατασταθεί λόγω μη-επιτρεπόμενου κώδικα μέσα στην Εφαρμογή",
 "App can't be installed because it is not compatible with this version of ownCloud" => "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή περιέχει την ετικέτα <shipped>σωστή</shipped> που δεν επιτρέπεται για μη-ενσωματωμένες εφαρμογές",
 "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή η έκδοση στο info.xml/version δεν είναι η ίδια με την έκδοση που αναφέρεται στο κατάστημα εφαρμογών",
 "App directory already exists" => "Ο κατάλογος εφαρμογών υπάρχει ήδη",
 "Can't create app folder. Please fix permissions. %s" => "Δεν είναι δυνατόν να δημιουργηθεί ο φάκελος εφαρμογής. Παρακαλώ διορθώστε τις άδειες πρόσβασης. %s",
 "Application is not enabled" => "Δεν ενεργοποιήθηκε η εφαρμογή",
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα.",
+"Unknown user" => "Άγνωστος χρήστης",
 "Files" => "Αρχεία",
 "Text" => "Κείμενο",
 "Images" => "Εικόνες",
@@ -39,13 +40,11 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s μάλλον δεν χρησιμοποιείτε τελείες στο όνομα της βάσης δεδομένων",
 "MS SQL username and/or password not valid: %s" => "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s",
 "You need to enter either an existing account or the administrator." => "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή.",
-"MySQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της MySQL",
+"MySQL/MariaDB username and/or password not valid" => "Μη έγκυρο όνομα χρήστη ή/και συνθηματικό της MySQL/MariaDB",
 "DB Error: \"%s\"" => "Σφάλμα Βάσης Δεδομένων: \"%s\"",
 "Offending command was: \"%s\"" => "Η εντολη παραβατικοτητας ηταν: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL.",
-"Drop this user from MySQL" => "Απόρριψη αυτού του χρήστη από την MySQL",
-"MySQL user '%s'@'%%' already exists" => "Ο χρήστης '%s'@'%%' της MySQL υπάρχει ήδη",
-"Drop this user from MySQL." => "Απόρριψη αυτού του χρήστη από την MySQL",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "Υπάρχει ήδη ο χρήστης '%s'@'%%' της MySQL/MariaDB",
 "Oracle connection could not be established" => "Αδυναμία σύνδεσης Oracle",
 "Oracle username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
 "Offending command was: \"%s\", name: %s, password: %s" => "Η εντολη παραβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s",
@@ -54,6 +53,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Εισάγετε συνθηματικό διαχειριστή.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ο διακομιστής σας δεν έχει ρυθμιστεί κατάλληλα ώστε να επιτρέπει τον συγχρονισμό αρχείων γιατί η διεπαφή WebDAV πιθανόν να είναι κατεστραμμένη.",
 "Please double check the <a href='%s'>installation guides</a>." => "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
+"%s shared »%s« with you" => "Ο %s διαμοιράστηκε μαζί σας το »%s«",
 "Could not find category \"%s\"" => "Αδυναμία εύρεσης κατηγορίας \"%s\"",
 "seconds ago" => "δευτερόλεπτα πριν",
 "_%n minute ago_::_%n minutes ago_" => array("","%n λεπτά πριν"),
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
index e2e8ee2e54..7d2246eb66 100644
--- a/lib/l10n/en_GB.php
+++ b/lib/l10n/en_GB.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Unknown filetype",
 "Invalid image" => "Invalid image",
 "web services under your control" => "web services under your control",
-"cannot open \"%s\"" => "cannot open \"%s\"",
 "ZIP download is turned off." => "ZIP download is turned off.",
 "Files need to be downloaded one by one." => "Files need to be downloaded one by one.",
 "Back to Files" => "Back to Files",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Application is not enabled",
 "Authentication error" => "Authentication error",
 "Token expired. Please reload page." => "Token expired. Please reload page.",
+"Unknown user" => "Unknown user",
 "Files" => "Files",
 "Text" => "Text",
 "Images" => "Images",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s you may not use dots in the database name",
 "MS SQL username and/or password not valid: %s" => "MS SQL username and/or password not valid: %s",
 "You need to enter either an existing account or the administrator." => "You need to enter either an existing account or the administrator.",
-"MySQL username and/or password not valid" => "MySQL username and/or password not valid",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB username and/or password not valid",
 "DB Error: \"%s\"" => "DB Error: \"%s\"",
 "Offending command was: \"%s\"" => "Offending command was: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL user '%s'@'localhost' exists already.",
-"Drop this user from MySQL" => "Drop this user from MySQL",
-"MySQL user '%s'@'%%' already exists" => "MySQL user '%s'@'%%' already exists",
-"Drop this user from MySQL." => "Drop this user from MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB user '%s'@'localhost' exists already.",
+"Drop this user from MySQL/MariaDB" => "Drop this user from MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB user '%s'@'%%' already exists",
+"Drop this user from MySQL/MariaDB." => "Drop this user from MySQL/MariaDB.",
 "Oracle connection could not be established" => "Oracle connection could not be established",
 "Oracle username and/or password not valid" => "Oracle username and/or password not valid",
 "Offending command was: \"%s\", name: %s, password: %s" => "Offending command was: \"%s\", name: %s, password: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Set an admin password.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
 "Please double check the <a href='%s'>installation guides</a>." => "Please double check the <a href='%s'>installation guides</a>.",
+"%s shared »%s« with you" => "%s shared \"%s\" with you",
 "Could not find category \"%s\"" => "Could not find category \"%s\"",
 "seconds ago" => "seconds ago",
 "_%n minute ago_::_%n minutes ago_" => array("%n minute ago","%n minutes ago"),
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index 53d1ec1854..faf262567c 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -5,6 +5,8 @@ $TRANSLATIONS = array(
 "Settings" => "Agordo",
 "Users" => "Uzantoj",
 "Admin" => "Administranto",
+"Unknown filetype" => "Ne konatas dosiertipo",
+"Invalid image" => "Ne validas bildo",
 "web services under your control" => "TTT-servoj regataj de vi",
 "ZIP download is turned off." => "ZIP-elŝuto estas malkapabligita.",
 "Files need to be downloaded one by one." => "Dosieroj devas elŝutiĝi unuope.",
@@ -20,12 +22,7 @@ $TRANSLATIONS = array(
 "%s enter the database name." => "%s enigu la nomon de la datumbazo.",
 "%s you may not use dots in the database name" => "%s vi ne povas uzi punktojn en la nomo de la datumbazo",
 "MS SQL username and/or password not valid: %s" => "La uzantonomo de MS SQL aŭ la pasvorto ne validas: %s",
-"MySQL username and/or password not valid" => "La uzantonomo de MySQL aŭ la pasvorto ne validas",
 "DB Error: \"%s\"" => "Datumbaza eraro: “%s”",
-"MySQL user '%s'@'localhost' exists already." => "La uzanto de MySQL “%s”@“localhost” jam ekzistas.",
-"Drop this user from MySQL" => "Forigi ĉi tiun uzanton el MySQL",
-"MySQL user '%s'@'%%' already exists" => "La uzanto de MySQL “%s”@“%%” jam ekzistas",
-"Drop this user from MySQL." => "Forigi ĉi tiun uzanton el MySQL.",
 "Oracle connection could not be established" => "Konekto al Oracle ne povas stariĝi",
 "Oracle username and/or password not valid" => "La uzantonomo de Oracle aŭ la pasvorto ne validas",
 "PostgreSQL username and/or password not valid" => "La uzantonomo de PostgreSQL aŭ la pasvorto ne validas",
@@ -33,15 +30,16 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Starigi administran pasvorton.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
 "Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
+"%s shared »%s« with you" => "%s kunhavigis “%s” kun vi",
 "Could not find category \"%s\"" => "Ne troviĝis kategorio “%s”",
 "seconds ago" => "sekundoj antaŭe",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","antaŭ %n minutoj"),
+"_%n hour ago_::_%n hours ago_" => array("","antaŭ %n horoj"),
 "today" => "hodiaŭ",
 "yesterday" => "hieraŭ",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","antaŭ %n tagoj"),
 "last month" => "lastamonate",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","antaŭ %n monatoj"),
 "last year" => "lastajare",
 "years ago" => "jaroj antaŭe"
 );
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index f231cd2bb6..14d6435c89 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -11,12 +11,11 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Tipo de archivo desconocido",
 "Invalid image" => "Imagen inválida",
 "web services under your control" => "Servicios web bajo su control",
-"cannot open \"%s\"" => "No se puede abrir \"%s\"",
 "ZIP download is turned off." => "La descarga en ZIP está desactivada.",
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados uno por uno.",
 "Back to Files" => "Volver a Archivos",
 "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
-"Please download the files separately in smaller chunks or kindly ask your administrator." => "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente a su administrador.",
+"Please download the files separately in smaller chunks or kindly ask your administrator." => "Descargue los archivos en trozos más pequeños, por separado o solicítelos amablemente su administrador.",
 "No source specified when installing app" => "No se ha especificado origen cuando se ha instalado la aplicación",
 "No href specified when installing app from http" => "No href especificado cuando se ha instalado la aplicación",
 "No path specified when installing app from local file" => "Sin path especificado  cuando se ha instalado la aplicación desde el fichero local",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "La aplicación no está habilitada",
 "Authentication error" => "Error de autenticación",
 "Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
+"Unknown user" => "Usuario desconocido",
 "Files" => "Archivos",
 "Text" => "Texto",
 "Images" => "Imágenes",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s puede utilizar puntos en el nombre de la base de datos",
 "MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
 "You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
-"MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos",
+"MySQL/MariaDB username and/or password not valid" => "Nombre de usuario o contraseña de MySQL/MariaDB inválidos",
 "DB Error: \"%s\"" => "Error BD: \"%s\"",
 "Offending command was: \"%s\"" => "Comando infractor: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Usuario MySQL '%s'@'localhost' ya existe.",
-"Drop this user from MySQL" => "Eliminar este usuario de MySQL",
-"MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existe",
-"Drop this user from MySQL." => "Eliminar este usuario de MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "El usuario de MySQL/MariaDB '%s'@'localhost' ya existe.",
+"Drop this user from MySQL/MariaDB" => "Eliminar este usuario de MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "El usuario de MySQL/MariaDB '%s'@'%%' ya existe",
+"Drop this user from MySQL/MariaDB." => "Eliminar este usuario de MySQL/MariaDB.",
 "Oracle connection could not be established" => "No se pudo establecer la conexión a Oracle",
 "Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
 "Offending command was: \"%s\", name: %s, password: %s" => "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Configurar la contraseña del administrador.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
+"%s shared »%s« with you" => "%s ha compatido  »%s« contigo",
 "Could not find category \"%s\"" => "No puede encontrar la categoria \"%s\"",
 "seconds ago" => "hace segundos",
 "_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index bc5fcd7e01..a925e22ba8 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -11,11 +11,11 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Tipo de archivo desconocido",
 "Invalid image" => "Imagen inválida",
 "web services under your control" => "servicios web sobre los que tenés control",
-"cannot open \"%s\"" => "no se puede abrir \"%s\"",
 "ZIP download is turned off." => "La descarga en ZIP está desactivada.",
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados de a uno.",
 "Back to Files" => "Volver a Archivos",
 "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
+"Please download the files separately in smaller chunks or kindly ask your administrator." => "Por favor, descargue estos archivos de forma separada en pequeñas partes o pídalo amablemente a su administrador.",
 "No source specified when installing app" => "No se especificó el origen al instalar la app",
 "No href specified when installing app from http" => "No se especificó href al instalar la app",
 "No path specified when installing app from local file" => "No se especificó PATH al instalar la app desde el archivo local",
@@ -39,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s no podés usar puntos en el nombre de la base de datos",
 "MS SQL username and/or password not valid: %s" => "Nombre de usuario y contraseña de MS SQL no son válidas: %s",
 "You need to enter either an existing account or the administrator." => "Tenés que ingresar una cuenta existente o el administrador.",
-"MySQL username and/or password not valid" => "Usuario y/o contraseña MySQL no válido",
 "DB Error: \"%s\"" => "Error DB: \"%s\"",
 "Offending command was: \"%s\"" => "El comando no comprendido es: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Usuario MySQL '%s'@'localhost' ya existe.",
-"Drop this user from MySQL" => "Borrar este usuario de MySQL",
-"MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existe",
-"Drop this user from MySQL." => "Borrar este usuario de MySQL",
 "Oracle connection could not be established" => "No fue posible establecer la conexión a Oracle",
 "Oracle username and/or password not valid" => "El nombre de usuario y/o contraseña no son válidos",
 "Offending command was: \"%s\", name: %s, password: %s" => "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"",
@@ -54,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Configurar una contraseña de administrador.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
+"%s shared »%s« with you" => "%s compartió \"%s\" con vos",
 "Could not find category \"%s\"" => "No fue posible encontrar la categoría \"%s\"",
 "seconds ago" => "segundos atrás",
 "_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
diff --git a/lib/l10n/es_CL.php b/lib/l10n/es_CL.php
index 46158b0ccc..a2669b110c 100644
--- a/lib/l10n/es_CL.php
+++ b/lib/l10n/es_CL.php
@@ -2,9 +2,15 @@
 $TRANSLATIONS = array(
 "Settings" => "Configuración",
 "Files" => "Archivos",
+"seconds ago" => "segundos antes",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
+"today" => "hoy",
+"yesterday" => "ayer",
 "_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
+"last month" => "mes anterior",
+"_%n month ago_::_%n months ago_" => array("",""),
+"last year" => "último año",
+"years ago" => "años anteriores"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_MX.php b/lib/l10n/es_MX.php
index 7454d4966d..2f0ed33f6b 100644
--- a/lib/l10n/es_MX.php
+++ b/lib/l10n/es_MX.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Tipo de archivo desconocido",
 "Invalid image" => "Imagen inválida",
 "web services under your control" => "Servicios web bajo su control",
-"cannot open \"%s\"" => "No se puede abrir \"%s\"",
 "ZIP download is turned off." => "La descarga en ZIP está desactivada.",
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados uno por uno.",
 "Back to Files" => "Volver a Archivos",
@@ -40,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s puede utilizar puntos en el nombre de la base de datos",
 "MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
 "You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
-"MySQL username and/or password not valid" => "Usuario y/o contraseña de MySQL no válidos",
 "DB Error: \"%s\"" => "Error BD: \"%s\"",
 "Offending command was: \"%s\"" => "Comando infractor: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Usuario MySQL '%s'@'localhost' ya existe.",
-"Drop this user from MySQL" => "Eliminar este usuario de MySQL",
-"MySQL user '%s'@'%%' already exists" => "Usuario MySQL '%s'@'%%' ya existe",
-"Drop this user from MySQL." => "Eliminar este usuario de MySQL.",
 "Oracle connection could not be established" => "No se pudo establecer la conexión a Oracle",
 "Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
 "Offending command was: \"%s\", name: %s, password: %s" => "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
@@ -55,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Configurar la contraseña del administrador.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
+"%s shared »%s« with you" => "%s ha compartido  »%s« contigo",
 "Could not find category \"%s\"" => "No puede encontrar la categoria \"%s\"",
 "seconds ago" => "hace segundos",
 "_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 96fceaa04e..f6435320c6 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Tundmatu failitüüp",
 "Invalid image" => "Vigane pilt",
 "web services under your control" => "veebitenused sinu kontrolli all",
-"cannot open \"%s\"" => "ei suuda avada \"%s\"",
 "ZIP download is turned off." => "ZIP-ina allalaadimine on välja lülitatud.",
 "Files need to be downloaded one by one." => "Failid tuleb alla laadida ükshaaval.",
 "Back to Files" => "Tagasi failide juurde",
@@ -40,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s punktide kasutamine andmebaasi nimes pole lubatud",
 "MS SQL username and/or password not valid: %s" => "MS SQL kasutajatunnus ja/või parool pole õiged: %s",
 "You need to enter either an existing account or the administrator." => "Sisesta kas juba olemasolev konto või administrator.",
-"MySQL username and/or password not valid" => "MySQL kasutajatunnus ja/või parool pole õiged",
 "DB Error: \"%s\"" => "Andmebaasi viga: \"%s\"",
 "Offending command was: \"%s\"" => "Tõrkuv käsk oli: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL kasutaja '%s'@'localhost' on juba olemas.",
-"Drop this user from MySQL" => "Kustuta see kasutaja MySQL-ist",
-"MySQL user '%s'@'%%' already exists" => "MySQL kasutaja '%s'@'%%' on juba olemas",
-"Drop this user from MySQL." => "Kustuta see kasutaja MySQL-ist.",
 "Oracle connection could not be established" => "Ei suuda luua ühendust Oracle baasiga",
 "Oracle username and/or password not valid" => "Oracle kasutajatunnus ja/või parool pole õiged",
 "Offending command was: \"%s\", name: %s, password: %s" => "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s",
@@ -55,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Määra admini parool.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
 "Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
+"%s shared »%s« with you" => "%s jagas sinuga »%s«",
 "Could not find category \"%s\"" => "Ei leia kategooriat \"%s\"",
 "seconds ago" => "sekundit tagasi",
 "_%n minute ago_::_%n minutes ago_" => array("","%n minutit tagasi"),
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index e3f18fca47..58c198cff1 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Fitxategi mota ezezaguna",
 "Invalid image" => "Baliogabeko irudia",
 "web services under your control" => "web zerbitzuak zure kontrolpean",
-"cannot open \"%s\"" => "ezin da \"%s\" ireki",
 "ZIP download is turned off." => "ZIP deskarga ez dago gaituta.",
 "Files need to be downloaded one by one." => "Fitxategiak banan-banan deskargatu behar dira.",
 "Back to Files" => "Itzuli fitxategietara",
@@ -40,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s ezin duzu punturik erabili datu basearen izenean.",
 "MS SQL username and/or password not valid: %s" => "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
 "You need to enter either an existing account or the administrator." => "Existitzen den kontu bat edo administradorearena jarri behar duzu.",
-"MySQL username and/or password not valid" => "MySQL erabiltzaile edota pasahitza ez dira egokiak.",
 "DB Error: \"%s\"" => "DB errorea: \"%s\"",
 "Offending command was: \"%s\"" => "Errorea komando honek sortu du: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL '%s'@'localhost' erabiltzailea dagoeneko existitzen da.",
-"Drop this user from MySQL" => "Ezabatu erabiltzaile hau MySQLtik",
-"MySQL user '%s'@'%%' already exists" => "MySQL '%s'@'%%' erabiltzailea dagoeneko existitzen da",
-"Drop this user from MySQL." => "Ezabatu erabiltzaile hau MySQLtik.",
 "Oracle connection could not be established" => "Ezin da Oracle konexioa sortu",
 "Oracle username and/or password not valid" => "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
 "Offending command was: \"%s\", name: %s, password: %s" => "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s",
@@ -55,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Ezarri administraziorako pasahitza.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
 "Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
+"%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du",
 "Could not find category \"%s\"" => "Ezin da \"%s\" kategoria aurkitu",
 "seconds ago" => "segundu",
 "_%n minute ago_::_%n minutes ago_" => array("orain dela minutu %n","orain dela %n minutu"),
diff --git a/lib/l10n/eu_ES.php b/lib/l10n/eu_ES.php
new file mode 100644
index 0000000000..35192433a2
--- /dev/null
+++ b/lib/l10n/eu_ES.php
@@ -0,0 +1,9 @@
+<?php
+$TRANSLATIONS = array(
+"Personal" => "Pertsonala",
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index 788b370396..7323ffe191 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -21,13 +21,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s شما نباید از نقطه در نام پایگاه داده استفاده نمایید.",
 "MS SQL username and/or password not valid: %s" => "نام کاربری و / یا رمزعبور MS SQL معتبر نیست:  %s",
 "You need to enter either an existing account or the administrator." => "شما نیاز به وارد کردن یک حساب کاربری موجود یا حساب مدیریتی دارید.",
-"MySQL username and/or password not valid" => "نام کاربری و / یا رمزعبور MySQL  معتبر نیست.",
 "DB Error: \"%s\"" => "خطای پایگاه داده: \"%s\"",
 "Offending command was: \"%s\"" => "دستور متخلف عبارت است از: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "کاربرMySQL '%s'@'localhost' درحال حاضر موجود است.",
-"Drop this user from MySQL" => "این کاربر را از MySQL حذف نمایید.",
-"MySQL user '%s'@'%%' already exists" => "کاربر'%s'@'%%'  MySQL  در حال حاضر موجود است.",
-"Drop this user from MySQL." => "این کاربر را از MySQL حذف نمایید.",
 "Oracle connection could not be established" => "ارتباط اراکل نمیتواند برقرار باشد.",
 "Oracle username and/or password not valid" => "نام کاربری و / یا رمزعبور اراکل معتبر نیست.",
 "Offending command was: \"%s\", name: %s, password: %s" => "دستور متخلف عبارت است از: \"%s\"، نام: \"%s\"، رمزعبور:\"%s\"",
@@ -36,6 +31,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "یک رمزعبور برای مدیر تنظیم نمایید.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است.",
 "Please double check the <a href='%s'>installation guides</a>." => "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
+"%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
 "Could not find category \"%s\"" => "دسته بندی %s یافت نشد",
 "seconds ago" => "ثانیه‌ها پیش",
 "_%n minute ago_::_%n minutes ago_" => array(""),
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 573704da44..018e4c04c4 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -28,6 +28,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Sovellusta ei ole otettu käyttöön",
 "Authentication error" => "Tunnistautumisvirhe",
 "Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
+"Unknown user" => "Tuntematon käyttäjä",
 "Files" => "Tiedostot",
 "Text" => "Teksti",
 "Images" => "Kuvat",
@@ -35,18 +36,19 @@ $TRANSLATIONS = array(
 "%s enter the database name." => "%s anna tietokannan nimi.",
 "%s you may not use dots in the database name" => "%s et voi käyttää pisteitä tietokannan nimessä",
 "MS SQL username and/or password not valid: %s" => "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s",
-"MySQL username and/or password not valid" => "MySQL:n käyttäjätunnus ja/tai salasana on väärin",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB-käyttäjätunnus ja/tai salasana on virheellinen",
 "DB Error: \"%s\"" => "Tietokantavirhe: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL-käyttäjä '%s'@'localhost' on jo olemassa.",
-"Drop this user from MySQL" => "Pudota tämä käyttäjä MySQL:stä",
-"MySQL user '%s'@'%%' already exists" => "MySQL-käyttäjä '%s'@'%%' on jo olemassa",
-"Drop this user from MySQL." => "Pudota tämä käyttäjä MySQL:stä.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB-käyttäjä '%s'@'localhost' on jo olemassa.",
+"Drop this user from MySQL/MariaDB" => "Pudota tämä käyttäjä MySQL/MariaDB:stä",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB-käyttäjä '%s'@'%%' on jo olemassa",
+"Drop this user from MySQL/MariaDB." => "Pudota tämä käyttäjä MySQL/MariaDB:stä.",
 "Oracle connection could not be established" => "Oracle-yhteyttä ei voitu muodostaa",
 "Oracle username and/or password not valid" => "Oraclen käyttäjätunnus ja/tai salasana on väärin",
 "PostgreSQL username and/or password not valid" => "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
 "Set an admin username." => "Aseta ylläpitäjän käyttäjätunnus.",
 "Set an admin password." => "Aseta ylläpitäjän salasana.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
+"%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
 "Could not find category \"%s\"" => "Luokkaa \"%s\" ei löytynyt",
 "seconds ago" => "sekuntia sitten",
 "_%n minute ago_::_%n minutes ago_" => array("%n minuutti sitten","%n minuuttia sitten"),
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 75a4f27727..d866fb664e 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Type de fichier inconnu",
 "Invalid image" => "Image invalide",
 "web services under your control" => "services web sous votre contrôle",
-"cannot open \"%s\"" => "impossible d'ouvrir \"%s\"",
 "ZIP download is turned off." => "Téléchargement ZIP désactivé.",
 "Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.",
 "Back to Files" => "Retour aux Fichiers",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "L'application n'est pas activée",
 "Authentication error" => "Erreur d'authentification",
 "Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.",
+"Unknown user" => "Utilisateur inconnu",
 "Files" => "Fichiers",
 "Text" => "Texte",
 "Images" => "Images",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s vous nez pouvez pas utiliser de points dans le nom de la base de données",
 "MS SQL username and/or password not valid: %s" => "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
 "You need to enter either an existing account or the administrator." => "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur.",
-"MySQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base MySQL invalide",
+"MySQL/MariaDB username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe MySQL/MariaDB invalide",
 "DB Error: \"%s\"" => "Erreur de la base de données : \"%s\"",
 "Offending command was: \"%s\"" => "La requête en cause est : \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "L'utilisateur MySQL '%s'@'localhost' existe déjà.",
-"Drop this user from MySQL" => "Retirer cet utilisateur de la base MySQL",
-"MySQL user '%s'@'%%' already exists" => "L'utilisateur MySQL '%s'@'%%' existe déjà",
-"Drop this user from MySQL." => "Retirer cet utilisateur de la base MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "L'utilisateur MySQL/MariaDB '%s'@'localhost' existe déjà.",
+"Drop this user from MySQL/MariaDB" => "Retirer cet utilisateur de la base MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "L'utilisateur MySQL/MariaDB '%s'@'%%' existe déjà",
+"Drop this user from MySQL/MariaDB." => "Retirer cet utilisateur de la base MySQL/MariaDB.",
 "Oracle connection could not be established" => "La connexion Oracle ne peut pas être établie",
 "Oracle username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
 "Offending command was: \"%s\", name: %s, password: %s" => "La requête en cause est : \"%s\", nom : %s, mot de passe : %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Spécifiez un mot de passe administrateur.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web, n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav ne fonctionne pas comme il faut.",
 "Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
+"%s shared »%s« with you" => "%s partagé »%s« avec vous",
 "Could not find category \"%s\"" => "Impossible de trouver la catégorie \"%s\"",
 "seconds ago" => "il y a quelques secondes",
 "_%n minute ago_::_%n minutes ago_" => array("","il y a %n minutes"),
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 81a6202155..cc1351c2f1 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Tipo de ficheiro descoñecido",
 "Invalid image" => "Imaxe incorrecta",
 "web services under your control" => "servizos web baixo o seu control",
-"cannot open \"%s\"" => "non foi posíbel abrir «%s»",
 "ZIP download is turned off." => "As descargas ZIP están desactivadas.",
 "Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados dun en un.",
 "Back to Files" => "Volver aos ficheiros",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "O aplicativo non está activado",
 "Authentication error" => "Produciuse un erro de autenticación",
 "Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.",
+"Unknown user" => "Usuario descoñecido",
 "Files" => "Ficheiros",
 "Text" => "Texto",
 "Images" => "Imaxes",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s non se poden empregar puntos na base de datos",
 "MS SQL username and/or password not valid: %s" => "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s",
 "You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.",
-"MySQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de MySQL incorrecto",
+"MySQL/MariaDB username and/or password not valid" => "O nome e/ou o contrasinal do usuario de MySQL/MariaDB non é correcto",
 "DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
 "Offending command was: \"%s\"" => "A orde ofensiva foi: «%s»",
-"MySQL user '%s'@'localhost' exists already." => "O usuario MySQL  '%s'@'localhost' xa existe.",
-"Drop this user from MySQL" => "Omitir este usuario de MySQL",
-"MySQL user '%s'@'%%' already exists" => "O usuario MySQL «%s»@«%%» xa existe.",
-"Drop this user from MySQL." => "Omitir este usuario de MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "Xa existe o usuario «%s»@«localhost» no MySQL/MariaDB.",
+"Drop this user from MySQL/MariaDB" => "Eliminar este usuario do MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "Xa existe o usuario «%s»@«%%» no MySQL/MariaDB",
+"Drop this user from MySQL/MariaDB." => "Eliminar este usuario do MySQL/MariaDB.",
 "Oracle connection could not be established" => "Non foi posíbel estabelecer a conexión con Oracle",
 "Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
 "Offending command was: \"%s\", name: %s, password: %s" => "A orde ofensiva foi: «%s», nome: %s, contrasinal: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Estabeleza un contrasinal de administrador",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web non está aínda configurado adecuadamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
+"%s shared »%s« with you" => "%s compartiu «%s» con vostede",
 "Could not find category \"%s\"" => "Non foi posíbel atopar a categoría «%s»",
 "seconds ago" => "segundos atrás",
 "_%n minute ago_::_%n minutes ago_" => array("hai %n minuto","hai %n minutos"),
diff --git a/lib/l10n/he.php b/lib/l10n/he.php
index 5bbfffe9ae..6a9020009e 100644
--- a/lib/l10n/he.php
+++ b/lib/l10n/he.php
@@ -18,6 +18,7 @@ $TRANSLATIONS = array(
 "Images" => "תמונות",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
 "Please double check the <a href='%s'>installation guides</a>." => "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
+"%s shared »%s« with you" => "%s שיתף/שיתפה איתך את »%s«",
 "Could not find category \"%s\"" => "לא ניתן למצוא את הקטגוריה „%s“",
 "seconds ago" => "שניות",
 "_%n minute ago_::_%n minutes ago_" => array("","לפני %n דקות"),
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index efaf2a2fd4..2a03f72a51 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Ismeretlen file tipús",
 "Invalid image" => "Hibás kép",
 "web services under your control" => "webszolgáltatások saját kézben",
-"cannot open \"%s\"" => "nem sikerült megnyitni \"%s\"",
 "ZIP download is turned off." => "A ZIP-letöltés nincs engedélyezve.",
 "Files need to be downloaded one by one." => "A fájlokat egyenként kell letölteni.",
 "Back to Files" => "Vissza a Fájlokhoz",
@@ -40,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s az adatbázis neve nem tartalmazhat pontot",
 "MS SQL username and/or password not valid: %s" => "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s",
 "You need to enter either an existing account or the administrator." => "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia",
-"MySQL username and/or password not valid" => "A MySQL felhasználói név és/vagy jelszó érvénytelen",
 "DB Error: \"%s\"" => "Adatbázis hiba: \"%s\"",
 "Offending command was: \"%s\"" => "A hibát ez a parancs okozta: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "A '%s'@'localhost' MySQL felhasználó már létezik.",
-"Drop this user from MySQL" => "Törölje ezt a felhasználót a MySQL-ből",
-"MySQL user '%s'@'%%' already exists" => "A '%s'@'%%' MySQL felhasználó már létezik",
-"Drop this user from MySQL." => "Törölje ezt a felhasználót a MySQL-ből.",
 "Oracle connection could not be established" => "Az Oracle kapcsolat nem hozható létre",
 "Oracle username and/or password not valid" => "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
 "Offending command was: \"%s\", name: %s, password: %s" => "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s",
@@ -55,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Állítson be egy jelszót az adminisztrációhoz.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
 "Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
+"%s shared »%s« with you" => "%s megosztotta Önnel ezt:  »%s«",
 "Could not find category \"%s\"" => "Ez a kategória nem található: \"%s\"",
 "seconds ago" => "pár másodperce",
 "_%n minute ago_::_%n minutes ago_" => array("","%n perccel ezelőtt"),
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index 27d7843104..76dda80cf7 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Tipe berkas tak dikenal",
 "Invalid image" => "Gambar tidak sah",
 "web services under your control" => "layanan web dalam kendali anda",
-"cannot open \"%s\"" => "tidak dapat membuka \"%s\"",
 "ZIP download is turned off." => "Pengunduhan ZIP dimatikan.",
 "Files need to be downloaded one by one." => "Berkas harus diunduh satu persatu.",
 "Back to Files" => "Kembali ke Berkas",
@@ -40,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s anda tidak boleh menggunakan karakter titik pada nama basis data",
 "MS SQL username and/or password not valid: %s" => "Nama pengguna dan/atau sandi MySQL tidak sah: %s",
 "You need to enter either an existing account or the administrator." => "Anda harus memasukkan akun yang sudah ada atau administrator.",
-"MySQL username and/or password not valid" => "Nama pengguna dan/atau sandi MySQL tidak sah",
 "DB Error: \"%s\"" => "Galat Basis Data: \"%s\"",
 "Offending command was: \"%s\"" => "Perintah yang bermasalah: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Pengguna MySQL '%s'@'localhost' sudah ada.",
-"Drop this user from MySQL" => "Hapus pengguna ini dari MySQL",
-"MySQL user '%s'@'%%' already exists" => "Pengguna MySQL '%s'@'%%' sudah ada.",
-"Drop this user from MySQL." => "Hapus pengguna ini dari MySQL.",
 "Oracle connection could not be established" => "Koneksi Oracle tidak dapat dibuat",
 "Oracle username and/or password not valid" => "Nama pengguna dan/atau sandi Oracle tidak sah",
 "Offending command was: \"%s\", name: %s, password: %s" => "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
@@ -55,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Atur sandi admin.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
 "Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
+"%s shared »%s« with you" => "%s membagikan »%s« dengan anda",
 "Could not find category \"%s\"" => "Tidak menemukan kategori \"%s\"",
 "seconds ago" => "beberapa detik yang lalu",
 "_%n minute ago_::_%n minutes ago_" => array("%n menit yang lalu"),
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index cd2073bfd0..ed1cbc2e31 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Tipo di file sconosciuto",
 "Invalid image" => "Immagine non valida",
 "web services under your control" => "servizi web nelle tue mani",
-"cannot open \"%s\"" => "impossibile aprire \"%s\"",
 "ZIP download is turned off." => "Lo scaricamento in formato ZIP è stato disabilitato.",
 "Files need to be downloaded one by one." => "I file devono essere scaricati uno alla volta.",
 "Back to Files" => "Torna ai file",
@@ -25,13 +24,14 @@ $TRANSLATIONS = array(
 "App does not provide an info.xml file" => "L'applicazione non fornisce un file info.xml",
 "App can't be installed because of not allowed code in the App" => "L'applicazione non può essere installata a causa di codice non consentito al suo interno",
 "App can't be installed because it is not compatible with this version of ownCloud" => "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che non è permesso alle applicazioni non shipped",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che è consentito per le applicazioni native",
 "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "L'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store",
 "App directory already exists" => "La cartella dell'applicazione esiste già",
 "Can't create app folder. Please fix permissions. %s" => "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
 "Application is not enabled" => "L'applicazione  non è abilitata",
 "Authentication error" => "Errore di autenticazione",
 "Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.",
+"Unknown user" => "Utente sconosciuto",
 "Files" => "File",
 "Text" => "Testo",
 "Images" => "Immagini",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s non dovresti utilizzare punti nel nome del database",
 "MS SQL username and/or password not valid: %s" => "Nome utente e/o password MS SQL non validi: %s",
 "You need to enter either an existing account or the administrator." => "È necessario inserire un account esistente o l'amministratore.",
-"MySQL username and/or password not valid" => "Nome utente e/o password di MySQL non validi",
+"MySQL/MariaDB username and/or password not valid" => "Nome utente e/o password di MySQL/MariaDB non validi",
 "DB Error: \"%s\"" => "Errore DB: \"%s\"",
 "Offending command was: \"%s\"" => "Il comando non consentito era: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "L'utente MySQL '%s'@'localhost' esiste già.",
-"Drop this user from MySQL" => "Elimina questo utente da MySQL",
-"MySQL user '%s'@'%%' already exists" => "L'utente MySQL '%s'@'%%' esiste già",
-"Drop this user from MySQL." => "Elimina questo utente da MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "L'utente MySQL/MariaDB '%s'@'localhost' esiste già.",
+"Drop this user from MySQL/MariaDB" => "Elimina questo utente da MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "L'utente MySQL/MariaDB '%s'@'%%' esiste già",
+"Drop this user from MySQL/MariaDB." => "Elimina questo utente da MySQL/MariaDB.",
 "Oracle connection could not be established" => "La connessione a Oracle non può essere stabilita",
 "Oracle username and/or password not valid" => "Nome utente e/o password di Oracle non validi",
 "Offending command was: \"%s\", name: %s, password: %s" => "Il comando non consentito era: \"%s\", nome: %s, password: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Imposta una password di amministrazione.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra essere danneggiata.",
 "Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
+"%s shared »%s« with you" => "%s ha condiviso «%s» con te",
 "Could not find category \"%s\"" => "Impossibile trovare la categoria \"%s\"",
 "seconds ago" => "secondi fa",
 "_%n minute ago_::_%n minutes ago_" => array("%n minuto fa","%n minuti fa"),
diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php
new file mode 100644
index 0000000000..015c885904
--- /dev/null
+++ b/lib/l10n/ja.php
@@ -0,0 +1,71 @@
+<?php
+$TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => " \"%s\" アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
+"No app name specified" => "アプリ名が未指定",
+"Help" => "ヘルプ",
+"Personal" => "個人",
+"Settings" => "設定",
+"Users" => "ユーザー",
+"Admin" => "管理",
+"Failed to upgrade \"%s\"." => "\"%s\" へのアップグレードに失敗しました。",
+"Unknown filetype" => "不明なファイルタイプ",
+"Invalid image" => "無効な画像",
+"web services under your control" => "管理下のウェブサービス",
+"ZIP download is turned off." => "ZIPダウンロードは無効です。",
+"Files need to be downloaded one by one." => "ファイルは1つずつダウンロードする必要があります。",
+"Back to Files" => "ファイルに戻る",
+"Selected files too large to generate zip file." => "選択したファイルはZIPファイルの生成には大きすぎます。",
+"Please download the files separately in smaller chunks or kindly ask your administrator." => "少しずつに分けてファイルをダウンロードするか、管理者に問い合わせてください。",
+"No source specified when installing app" => "アプリインストール時のソースが未指定",
+"No href specified when installing app from http" => "アプリインストール時のhttpの URL が未指定",
+"No path specified when installing app from local file" => "アプリインストール時のローカルファイルのパスが未指定",
+"Archives of type %s are not supported" => "\"%s\"タイプのアーカイブ形式は未サポート",
+"Failed to open archive when installing app" => "アプリをインストール中にアーカイブファイルを開けませんでした。",
+"App does not provide an info.xml file" => "アプリにinfo.xmlファイルが入っていません",
+"App can't be installed because of not allowed code in the App" => "アプリで許可されないコードが入っているのが原因でアプリがインストールできません",
+"App can't be installed because it is not compatible with this version of ownCloud" => "アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/versionのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません",
+"App directory already exists" => "アプリディレクトリはすでに存在します",
+"Can't create app folder. Please fix permissions. %s" => "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。",
+"Application is not enabled" => "アプリケーションは無効です",
+"Authentication error" => "認証エラー",
+"Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。",
+"Unknown user" => "不明なユーザー",
+"Files" => "ファイル",
+"Text" => "TTY TDD",
+"Images" => "画像",
+"%s enter the database username." => "%s のデータベースのユーザー名を入力してください。",
+"%s enter the database name." => "%s のデータベース名を入力してください。",
+"%s you may not use dots in the database name" => "%s ではデータベース名にドットを利用できないかもしれません。",
+"MS SQL username and/or password not valid: %s" => "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s",
+"You need to enter either an existing account or the administrator." => "既存のアカウントもしくは管理者のどちらかを入力する必要があります。",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB のユーザー名及び/またはパスワードが無効",
+"DB Error: \"%s\"" => "DBエラー: \"%s\"",
+"Offending command was: \"%s\"" => "違反コマンド: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB のユーザー '%s'@'localhost' はすでに存在します。",
+"Drop this user from MySQL/MariaDB" => "MySQL/MariaDB からこのユーザーを削除",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB のユーザー '%s'@'%%' はすでに存在します",
+"Drop this user from MySQL/MariaDB." => "MySQL/MariaDB からこのユーザーを削除。",
+"Oracle connection could not be established" => "Oracleへの接続が確立できませんでした。",
+"Oracle username and/or password not valid" => "Oracleのユーザー名もしくはパスワードは有効ではありません",
+"Offending command was: \"%s\", name: %s, password: %s" => "違反コマンド: \"%s\"、名前: %s、パスワード: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQLのユーザー名もしくはパスワードは有効ではありません",
+"Set an admin username." => "管理者のユーザー名を設定",
+"Set an admin password." => "管理者のパスワードを設定。",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
+"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
+"%s shared »%s« with you" => "%sが あなたと »%s«を共有しました",
+"Could not find category \"%s\"" => "カテゴリ \"%s\" が見つかりませんでした",
+"seconds ago" => "数秒前",
+"_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
+"_%n hour ago_::_%n hours ago_" => array("%n 時間前"),
+"today" => "今日",
+"yesterday" => "1日前",
+"_%n day go_::_%n days ago_" => array("%n日前"),
+"last month" => "1ヶ月前",
+"_%n month ago_::_%n months ago_" => array("%nヶ月前"),
+"last year" => "1年前",
+"years ago" => "年前"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 9c5c0ba476..015c885904 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -1,17 +1,16 @@
 <?php
 $TRANSLATIONS = array(
-"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => " \"%s\" アプリは、このバージョンのownCloudと互換性がない為、インストールできません。",
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => " \"%s\" アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
 "No app name specified" => "アプリ名が未指定",
 "Help" => "ヘルプ",
 "Personal" => "個人",
 "Settings" => "設定",
-"Users" => "ユーザ",
+"Users" => "ユーザー",
 "Admin" => "管理",
 "Failed to upgrade \"%s\"." => "\"%s\" へのアップグレードに失敗しました。",
 "Unknown filetype" => "不明なファイルタイプ",
 "Invalid image" => "無効な画像",
 "web services under your control" => "管理下のウェブサービス",
-"cannot open \"%s\"" => "\"%s\" が開けません",
 "ZIP download is turned off." => "ZIPダウンロードは無効です。",
 "Files need to be downloaded one by one." => "ファイルは1つずつダウンロードする必要があります。",
 "Back to Files" => "ファイルに戻る",
@@ -24,47 +23,49 @@ $TRANSLATIONS = array(
 "Failed to open archive when installing app" => "アプリをインストール中にアーカイブファイルを開けませんでした。",
 "App does not provide an info.xml file" => "アプリにinfo.xmlファイルが入っていません",
 "App can't be installed because of not allowed code in the App" => "アプリで許可されないコードが入っているのが原因でアプリがインストールできません",
-"App can't be installed because it is not compatible with this version of ownCloud" => "アプリは、このバージョンのownCloudと互換性がない為、インストールできません。",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストール出来ません。",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/versionのバージョンがアプリストアのバージョンと合っていない為、アプリはインストールされません",
-"App directory already exists" => "アプリディレクトリは既に存在します",
-"Can't create app folder. Please fix permissions. %s" => "アプリフォルダを作成出来ませんでした。%s のパーミッションを修正してください。",
+"App can't be installed because it is not compatible with this version of ownCloud" => "アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/versionのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません",
+"App directory already exists" => "アプリディレクトリはすでに存在します",
+"Can't create app folder. Please fix permissions. %s" => "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。",
 "Application is not enabled" => "アプリケーションは無効です",
 "Authentication error" => "認証エラー",
 "Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。",
+"Unknown user" => "不明なユーザー",
 "Files" => "ファイル",
 "Text" => "TTY TDD",
 "Images" => "画像",
-"%s enter the database username." => "%s のデータベースのユーザ名を入力してください。",
+"%s enter the database username." => "%s のデータベースのユーザー名を入力してください。",
 "%s enter the database name." => "%s のデータベース名を入力してください。",
 "%s you may not use dots in the database name" => "%s ではデータベース名にドットを利用できないかもしれません。",
 "MS SQL username and/or password not valid: %s" => "MS SQL サーバーのユーザー名/パスワードが正しくありません: %s",
 "You need to enter either an existing account or the administrator." => "既存のアカウントもしくは管理者のどちらかを入力する必要があります。",
-"MySQL username and/or password not valid" => "MySQLのユーザ名もしくはパスワードは有効ではありません",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB のユーザー名及び/またはパスワードが無効",
 "DB Error: \"%s\"" => "DBエラー: \"%s\"",
 "Offending command was: \"%s\"" => "違反コマンド: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQLのユーザ '%s'@'localhost' はすでに存在します。",
-"Drop this user from MySQL" => "MySQLからこのユーザを削除",
-"MySQL user '%s'@'%%' already exists" => "MySQLのユーザ '%s'@'%%' はすでに存在します。",
-"Drop this user from MySQL." => "MySQLからこのユーザを削除する。",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB のユーザー '%s'@'localhost' はすでに存在します。",
+"Drop this user from MySQL/MariaDB" => "MySQL/MariaDB からこのユーザーを削除",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB のユーザー '%s'@'%%' はすでに存在します",
+"Drop this user from MySQL/MariaDB." => "MySQL/MariaDB からこのユーザーを削除。",
 "Oracle connection could not be established" => "Oracleへの接続が確立できませんでした。",
-"Oracle username and/or password not valid" => "Oracleのユーザ名もしくはパスワードは有効ではありません",
+"Oracle username and/or password not valid" => "Oracleのユーザー名もしくはパスワードは有効ではありません",
 "Offending command was: \"%s\", name: %s, password: %s" => "違反コマンド: \"%s\"、名前: %s、パスワード: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQLのユーザ名もしくはパスワードは有効ではありません",
-"Set an admin username." => "管理者のユーザ名を設定。",
+"PostgreSQL username and/or password not valid" => "PostgreSQLのユーザー名もしくはパスワードは有効ではありません",
+"Set an admin username." => "管理者のユーザー名を設定",
 "Set an admin password." => "管理者のパスワードを設定。",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
 "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
+"%s shared »%s« with you" => "%sが あなたと »%s«を共有しました",
 "Could not find category \"%s\"" => "カテゴリ \"%s\" が見つかりませんでした",
 "seconds ago" => "数秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
 "_%n hour ago_::_%n hours ago_" => array("%n 時間前"),
 "today" => "今日",
-"yesterday" => "昨日",
-"_%n day go_::_%n days ago_" => array("%n 日前"),
-"last month" => "一月前",
-"_%n month ago_::_%n months ago_" => array("%n ヶ月前"),
-"last year" => "一年前",
+"yesterday" => "1日前",
+"_%n day go_::_%n days ago_" => array("%n日前"),
+"last month" => "1ヶ月前",
+"_%n month ago_::_%n months ago_" => array("%nヶ月前"),
+"last year" => "1年前",
 "years ago" => "年前"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index 0cf6ab333e..e2a719d074 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -21,13 +21,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s არ მიუთითოთ წერტილი ბაზის სახელში",
 "MS SQL username and/or password not valid: %s" => "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s",
 "You need to enter either an existing account or the administrator." => "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი.",
-"MySQL username and/or password not valid" => "MySQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
 "DB Error: \"%s\"" => "DB შეცდომა: \"%s\"",
 "Offending command was: \"%s\"" => "Offending ბრძანება იყო: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL მომხმარებელი '%s'@'localhost' უკვე არსებობს.",
-"Drop this user from MySQL" => "წაშალე ეს მომხამრებელი MySQL–იდან",
-"MySQL user '%s'@'%%' already exists" => "MySQL მომხმარებელი '%s'@'%%' უკვე არსებობს",
-"Drop this user from MySQL." => "წაშალე ეს მომხამრებელი MySQL–იდან",
 "Oracle username and/or password not valid" => "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი",
 "Offending command was: \"%s\", name: %s, password: %s" => "Offending ბრძანება იყო: \"%s\", სახელი: %s, პაროლი: %s",
 "PostgreSQL username and/or password not valid" => "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
diff --git a/lib/l10n/km.php b/lib/l10n/km.php
index e7b09649a2..51dd4f33a7 100644
--- a/lib/l10n/km.php
+++ b/lib/l10n/km.php
@@ -1,8 +1,44 @@
 <?php
 $TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"_%n day go_::_%n days ago_" => array(""),
-"_%n month ago_::_%n months ago_" => array("")
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "មិន​អាច​ដំឡើង​កម្មវិធី \"%s\" បាន ព្រោះ​តែ​វា​មិន​ត្រូវ​គ្នា​នឹង​កំណែ ownCloud នេះ​ទេ។",
+"No app name specified" => "មិន​បាន​បញ្ជាក់​ឈ្មោះ​កម្មវិធី",
+"Help" => "ជំនួយ",
+"Personal" => "ផ្ទាល់​ខ្លួន",
+"Settings" => "ការកំណត់",
+"Users" => "អ្នកប្រើ",
+"Admin" => "អ្នក​គ្រប់​គ្រង",
+"Unknown filetype" => "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
+"Invalid image" => "រូបភាព​មិន​ត្រឹម​ត្រូវ",
+"web services under your control" => "សេវាកម្ម​វេប​ក្រោម​ការ​ការ​បញ្ជា​របស់​អ្នក",
+"ZIP download is turned off." => "បាន​បិទ​ការ​ទាញ​យក ZIP ។",
+"Files need to be downloaded one by one." => "ត្រូវ​ការ​ទាញ​យក​ឯកសារ​ម្ដង​មួយៗ។",
+"Back to Files" => "ត្រឡប់​ទៅ​ឯកសារ",
+"Selected files too large to generate zip file." => "ឯកសារ​ដែល​បាន​ជ្រើស មាន​ទំហំ​ធំ​ពេក​ក្នុង​ការ​បង្កើត​ជា zip ។",
+"App directory already exists" => "មាន​ទីតាំង​ផ្ទុក​កម្មវិធី​រួច​ហើយ",
+"Can't create app folder. Please fix permissions. %s" => "មិន​អាច​បង្កើត​ថត​កម្មវិធី។ សូម​កែ​សម្រួល​សិទ្ធិ។ %s",
+"Application is not enabled" => "មិន​បាន​បើក​កម្មវិធី",
+"Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
+"Files" => "ឯកសារ",
+"Text" => "អត្ថបទ",
+"Images" => "រូបភាព",
+"%s enter the database username." => "%s វាយ​បញ្ចូល​ឈ្មោះ​អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្នន័យ។",
+"%s enter the database name." => "%s វាយ​បញ្ចូល​ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ។",
+"%s you may not use dots in the database name" => "%s អ្នក​អាច​មិន​ប្រើ​សញ្ញា​ចុច​នៅ​ក្នុង​ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
+"DB Error: \"%s\"" => "កំហុស DB៖ \"%s\"",
+"Oracle connection could not be established" => "មិន​អាច​បង្កើត​ការ​តភ្ជាប់ Oracle",
+"PostgreSQL username and/or password not valid" => "ឈ្មោះ​អ្នក​ប្រើ និង/ឬ ពាក្យ​សម្ងាត់ PostgreSQL គឺ​មិន​ត្រូវ​ទេ",
+"Set an admin username." => "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្រង។",
+"Set an admin password." => "កំណត់​ពាក្យ​សម្ងាត់​អ្នក​គ្រប់គ្រង។",
+"Could not find category \"%s\"" => "រក​មិន​ឃើញ​ចំណាត់​ក្រុម \"%s\"",
+"seconds ago" => "វិនាទី​មុន",
+"_%n minute ago_::_%n minutes ago_" => array("%n នាទី​មុន"),
+"_%n hour ago_::_%n hours ago_" => array("%n ម៉ោង​មុន"),
+"today" => "ថ្ងៃនេះ",
+"yesterday" => "ម្សិលមិញ",
+"_%n day go_::_%n days ago_" => array("%n ថ្ងៃ​មុន"),
+"last month" => "ខែមុន",
+"_%n month ago_::_%n months ago_" => array("%n ខែ​មុន"),
+"last year" => "ឆ្នាំ​មុន",
+"years ago" => "ឆ្នាំ​មុន"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index b33ad01546..833476f646 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "알 수 없는 파일 형식",
 "Invalid image" => "잘못된 그림",
 "web services under your control" => "내가 관리하는 웹 서비스",
-"cannot open \"%s\"" => "\"%s\"을(를) 열 수 없습니다.",
 "ZIP download is turned off." => "ZIP 다운로드가 비활성화 되었습니다.",
 "Files need to be downloaded one by one." => "파일을 개별적으로 다운로드해야 합니다.",
 "Back to Files" => "파일로 돌아가기",
@@ -40,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s 데이터베이스 이름에는 마침표를 사용할 수 없습니다",
 "MS SQL username and/or password not valid: %s" => "MS SQL 사용자 이름이나 암호가 잘못되었습니다: %s",
 "You need to enter either an existing account or the administrator." => "기존 계정이나 administrator(관리자)를 입력해야 합니다.",
-"MySQL username and/or password not valid" => "MySQL 사용자 이름이나 암호가 잘못되었습니다.",
 "DB Error: \"%s\"" => "DB 오류: \"%s\"",
 "Offending command was: \"%s\"" => "잘못된 명령: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL 사용자 '%s'@'localhost'이(가) 이미 존재합니다.",
-"Drop this user from MySQL" => "이 사용자를 MySQL에서 삭제하십시오",
-"MySQL user '%s'@'%%' already exists" => "MySQL 사용자 '%s'@'%%'이(가) 이미 존재합니다.",
-"Drop this user from MySQL." => "이 사용자를 MySQL에서 삭제하십시오.",
 "Oracle connection could not be established" => "Oracle 연결을 수립할 수 없습니다.",
 "Oracle username and/or password not valid" => "Oracle 사용자 이름이나 암호가 잘못되었습니다.",
 "Offending command was: \"%s\", name: %s, password: %s" => "잘못된 명령: \"%s\", 이름: %s, 암호: %s",
@@ -55,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "관리자의 암호를 설정합니다.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAV 인터페이스가 제대로 작동하지 않습니다. 웹 서버에서 파일 동기화를 사용할 수 있도록 설정이 제대로 되지 않은 것 같습니다.",
 "Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
+"%s shared »%s« with you" => "%s 님이 %s을(를) 공유하였습니다",
 "Could not find category \"%s\"" => "분류 \"%s\"을(를) 찾을 수 없습니다.",
 "seconds ago" => "초 전",
 "_%n minute ago_::_%n minutes ago_" => array("%n분 전 "),
diff --git a/lib/l10n/ku_IQ.php b/lib/l10n/ku_IQ.php
index c99f9dd2a1..133fe99f2d 100644
--- a/lib/l10n/ku_IQ.php
+++ b/lib/l10n/ku_IQ.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Users" => "به‌كارهێنه‌ر",
 "Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
 "web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
+"Files" => "په‌ڕگەکان",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("",""),
 "_%n day go_::_%n days ago_" => array("",""),
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index 629d5b11c3..9caa876655 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Authentication error" => "Authentifikatioun's Fehler",
 "Files" => "Dateien",
 "Text" => "SMS",
+"%s shared »%s« with you" => "Den/D' %s huet »%s« mat dir gedeelt",
 "seconds ago" => "Sekonnen hir",
 "_%n minute ago_::_%n minutes ago_" => array("","%n Minutten hir"),
 "_%n hour ago_::_%n hours ago_" => array("",""),
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index 25957702d2..dac8eed763 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Nežinomas failo tipas",
 "Invalid image" => "Netinkamas paveikslėlis",
 "web services under your control" => "jūsų valdomos web paslaugos",
-"cannot open \"%s\"" => "nepavyksta atverti „%s“",
 "ZIP download is turned off." => "ZIP atsisiuntimo galimybė yra išjungta.",
 "Files need to be downloaded one by one." => "Failai turi būti parsiunčiami vienas po kito.",
 "Back to Files" => "Atgal į Failus",
@@ -40,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s negalite naudoti taškų duombazės pavadinime",
 "MS SQL username and/or password not valid: %s" => "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %s",
 "You need to enter either an existing account or the administrator." => "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi.",
-"MySQL username and/or password not valid" => "Neteisingas MySQL naudotojo vardas ir/arba slaptažodis",
 "DB Error: \"%s\"" => "DB klaida: \"%s\"",
 "Offending command was: \"%s\"" => "Vykdyta komanda buvo: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL naudotojas '%s'@'localhost' jau egzistuoja.",
-"Drop this user from MySQL" => "Pašalinti šį naudotoją iš MySQL",
-"MySQL user '%s'@'%%' already exists" => "MySQL naudotojas '%s'@'%%' jau egzistuoja",
-"Drop this user from MySQL." => "Pašalinti šį naudotoją iš MySQL.",
 "Oracle connection could not be established" => "Nepavyko sukurti Oracle ryšio",
 "Oracle username and/or password not valid" => "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis",
 "Offending command was: \"%s\", name: %s, password: %s" => "Vykdyta komanda buvo: \"%s\", name: %s, password: %s",
@@ -55,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Nustatyti administratoriaus slaptažodį.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
 "Please double check the <a href='%s'>installation guides</a>." => "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
+"%s shared »%s« with you" => "%s pasidalino »%s« su tavimi",
 "Could not find category \"%s\"" => "Nepavyko rasti kategorijos „%s“",
 "seconds ago" => "prieš sekundę",
 "_%n minute ago_::_%n minutes ago_" => array("prieš %n min.","Prieš % minutes","Prieš %n minučių"),
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 8ecee5bdae..5461e077ec 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -7,7 +7,6 @@ $TRANSLATIONS = array(
 "Admin" => "Administratori",
 "Failed to upgrade \"%s\"." => "Kļūda atjauninot \"%s\"",
 "web services under your control" => "tīmekļa servisi tavā varā",
-"cannot open \"%s\"" => "Nevar atvērt \"%s\"",
 "ZIP download is turned off." => "ZIP lejupielādēšana ir izslēgta.",
 "Files need to be downloaded one by one." => "Datnes var lejupielādēt tikai katru atsevišķi.",
 "Back to Files" => "Atpakaļ pie datnēm",
@@ -23,13 +22,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s datubāžu nosaukumos nedrīkst izmantot punktus",
 "MS SQL username and/or password not valid: %s" => "Nav derīga MySQL parole un/vai lietotājvārds — %s",
 "You need to enter either an existing account or the administrator." => "Jums jāievada vai nu esošs vai administratora konts.",
-"MySQL username and/or password not valid" => "Nav derīga MySQL parole un/vai lietotājvārds",
 "DB Error: \"%s\"" => "DB kļūda — “%s”",
 "Offending command was: \"%s\"" => "Vainīgā komanda bija “%s”",
-"MySQL user '%s'@'localhost' exists already." => "MySQL lietotājs %s'@'localhost' jau eksistē.",
-"Drop this user from MySQL" => "Izmest šo lietotāju no MySQL",
-"MySQL user '%s'@'%%' already exists" => "MySQL lietotājs '%s'@'%%' jau eksistē",
-"Drop this user from MySQL." => "Izmest šo lietotāju no MySQL.",
 "Oracle connection could not be established" => "Nevar izveidot savienojumu ar Oracle",
 "Oracle username and/or password not valid" => "Nav derīga Oracle parole un/vai lietotājvārds",
 "Offending command was: \"%s\", name: %s, password: %s" => "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s",
@@ -38,6 +32,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Iestatiet administratora paroli.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
+"%s shared »%s« with you" => "%s kopīgots »%s« ar jums",
 "Could not find category \"%s\"" => "Nevarēja atrast kategoriju “%s”",
 "seconds ago" => "sekundes atpakaļ",
 "_%n minute ago_::_%n minutes ago_" => array("","","Pirms %n minūtēm"),
diff --git a/lib/l10n/ml.php b/lib/l10n/ml.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/ml.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/mn.php b/lib/l10n/mn.php
new file mode 100644
index 0000000000..15f78e0bce
--- /dev/null
+++ b/lib/l10n/mn.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","")
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index 5da36f9be3..4b41e54ef4 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -1,10 +1,13 @@
 <?php
 $TRANSLATIONS = array(
+"App \"%s\" can't be installed because it is not compatible with this version of ownCloud." => "App \"%s\" kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud.",
+"No app name specified" => "Intet app-navn spesifisert",
 "Help" => "Hjelp",
 "Personal" => "Personlig",
 "Settings" => "Innstillinger",
 "Users" => "Brukere",
 "Admin" => "Admin",
+"Failed to upgrade \"%s\"." => "Klarte ikke å oppgradere \"%s\".",
 "Unknown filetype" => "Ukjent filtype",
 "Invalid image" => "Ugyldig bilde",
 "web services under your control" => "web tjenester du kontrollerer",
@@ -12,14 +15,41 @@ $TRANSLATIONS = array(
 "Files need to be downloaded one by one." => "Filene må lastes ned en om gangen",
 "Back to Files" => "Tilbake til filer",
 "Selected files too large to generate zip file." => "De valgte filene er for store til å kunne generere ZIP-fil",
+"Please download the files separately in smaller chunks or kindly ask your administrator." => "Vennligst last ned filene separat i mindre deler eller spør administratoren pent.",
+"No source specified when installing app" => "Ingen kilde spesifisert ved installering av app",
+"No href specified when installing app from http" => "Ingen href spesifisert ved installering av app fra http",
+"No path specified when installing app from local file" => "Ingen sti spesifisert ved installering av app fra lokal fil",
+"Archives of type %s are not supported" => "Arkiver av type %s støttes ikke",
+"Failed to open archive when installing app" => "Klarte ikke å åpne arkiv ved installering av app",
+"App does not provide an info.xml file" => "App-en inneholder ikke filen info.xml",
+"App can't be installed because of not allowed code in the App" => "App kan ikke installeres på grunn av ulovlig kode i appen.",
+"App can't be installed because it is not compatible with this version of ownCloud" => "App kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "App kan ikke installeres fordi den inneholder tag <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App kan ikke installeres fordi versjonen i info.xml/version ikke er den samme som versjonen som rapporteres fra app-butikken",
+"App directory already exists" => "App-mappe finnes allerede",
+"Can't create app folder. Please fix permissions. %s" => "Kan ikke opprette app-mappe.  Vennligst ordne opp i tillatelser. %s",
 "Application is not enabled" => "Applikasjon er ikke påslått",
 "Authentication error" => "Autentikasjonsfeil",
 "Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden på nytt.",
 "Files" => "Filer",
 "Text" => "Tekst",
 "Images" => "Bilder",
+"%s enter the database username." => "%s legg inn brukernavn for databasen.",
+"%s enter the database name." => "%s legg inn navnet på databasen.",
+"%s you may not use dots in the database name" => "%s du kan ikke bruke punktum i databasenavnet",
+"MS SQL username and/or password not valid: %s" => "MS SQL-brukernavn og/eller passord ikke gyldig: %s",
+"You need to enter either an existing account or the administrator." => "Du må legge inn enten en eksisterende konto eller administratoren.",
+"DB Error: \"%s\"" => "Databasefeil: \"%s\"",
+"Offending command was: \"%s\"" => "Kommandoen som feilet: \"%s\"",
+"Oracle connection could not be established" => "Klarte ikke å etablere forbindelse til Oracle",
+"Oracle username and/or password not valid" => "Oracle-brukernavn og/eller passord er ikke gyldig",
+"Offending command was: \"%s\", name: %s, password: %s" => "Kommando som feilet: \"%s\", navn: %s, passord: %s",
+"PostgreSQL username and/or password not valid" => "PostgreSQL-brukernavn og/eller passord er ikke gyldig",
+"Set an admin username." => "Sett et admin-brukernavn.",
+"Set an admin password." => "Sett et admin-passord.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
 "Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
+"%s shared »%s« with you" => "%s delte »%s« med deg",
 "Could not find category \"%s\"" => "Kunne ikke finne kategori \"%s\"",
 "seconds ago" => "sekunder siden",
 "_%n minute ago_::_%n minutes ago_" => array("","%n minutter siden"),
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 2f6205fcf1..dcf893af63 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Onbekend bestandsformaat",
 "Invalid image" => "Ongeldige afbeelding",
 "web services under your control" => "Webdiensten in eigen beheer",
-"cannot open \"%s\"" => "Kon \"%s\" niet openen",
 "ZIP download is turned off." => "ZIP download is uitgeschakeld.",
 "Files need to be downloaded one by one." => "Bestanden moeten één voor één worden gedownload.",
 "Back to Files" => "Terug naar bestanden",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "De applicatie is niet actief",
 "Authentication error" => "Authenticatie fout",
 "Token expired. Please reload page." => "Token verlopen.  Herlaad de pagina.",
+"Unknown user" => "Onbekende gebruiker",
 "Files" => "Bestanden",
 "Text" => "Tekst",
 "Images" => "Afbeeldingen",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s er mogen geen puntjes in de databasenaam voorkomen",
 "MS SQL username and/or password not valid: %s" => "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s",
 "You need to enter either an existing account or the administrator." => "Geef of een bestaand account op of het beheerdersaccount.",
-"MySQL username and/or password not valid" => "MySQL gebruikersnaam en/of wachtwoord ongeldig",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB gebruikersnaam en/of wachtwoord ongeldig",
 "DB Error: \"%s\"" => "DB Fout: \"%s\"",
 "Offending command was: \"%s\"" => "Onjuiste commande was: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL gebruiker '%s'@'localhost' bestaat al.",
-"Drop this user from MySQL" => "Verwijder deze gebruiker uit MySQL",
-"MySQL user '%s'@'%%' already exists" => "MySQL gebruiker '%s'@'%%' bestaat al",
-"Drop this user from MySQL." => "Verwijder deze gebruiker uit MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB gebruiker '%s'@'localhost' bestaat al.",
+"Drop this user from MySQL/MariaDB" => "Verwijder deze gebruiker uit MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB gebruiker '%s'@'%%' bestaat al",
+"Drop this user from MySQL/MariaDB." => "Verwijder deze gebruiker uit MySQL/MariaDB.",
 "Oracle connection could not be established" => "Er kon geen verbinding met Oracle worden bereikt",
 "Oracle username and/or password not valid" => "Oracle gebruikersnaam en/of wachtwoord ongeldig",
 "Offending command was: \"%s\", name: %s, password: %s" => "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Stel een beheerderswachtwoord in.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
+"%s shared »%s« with you" => "%s deelde »%s« met jou",
 "Could not find category \"%s\"" => "Kon categorie \"%s\" niet vinden",
 "seconds ago" => "seconden geleden",
 "_%n minute ago_::_%n minutes ago_" => array("%n minuut geleden","%n minuten geleden"),
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index e8bf8dfdef..db257f35dc 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -13,6 +13,7 @@ $TRANSLATIONS = array(
 "Text" => "Tekst",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
 "Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
+"%s shared »%s« with you" => "%s delte «%s» med deg",
 "seconds ago" => "sekund sidan",
 "_%n minute ago_::_%n minutes ago_" => array("","%n minutt sidan"),
 "_%n hour ago_::_%n hours ago_" => array("","%n timar sidan"),
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index fe3e876916..bc5e4a947c 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Nieznany typ pliku",
 "Invalid image" => "Błędne zdjęcie",
 "web services under your control" => "Kontrolowane serwisy",
-"cannot open \"%s\"" => "Nie można otworzyć \"%s\"",
 "ZIP download is turned off." => "Pobieranie ZIP jest wyłączone.",
 "Files need to be downloaded one by one." => "Pliki muszą zostać pobrane pojedynczo.",
 "Back to Files" => "Wróć do plików",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Aplikacja nie jest włączona",
 "Authentication error" => "Błąd uwierzytelniania",
 "Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.",
+"Unknown user" => "Nieznany użytkownik",
 "Files" => "Pliki",
 "Text" => "Połączenie tekstowe",
 "Images" => "Obrazy",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s nie można używać kropki w nazwie bazy danych",
 "MS SQL username and/or password not valid: %s" => "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s.",
 "You need to enter either an existing account or the administrator." => "Należy wprowadzić istniejące konto użytkownika lub  administratora.",
-"MySQL username and/or password not valid" => "MySQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
+"MySQL/MariaDB username and/or password not valid" => "Użytkownik i/lub hasło do MySQL/MariaDB są niepoprawne",
 "DB Error: \"%s\"" => "Błąd DB: \"%s\"",
 "Offending command was: \"%s\"" => "Niepoprawna komenda: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Użytkownik MySQL  '%s'@'localhost' już istnieje",
-"Drop this user from MySQL" => "Usuń tego użytkownika z MySQL",
-"MySQL user '%s'@'%%' already exists" => "Użytkownik MySQL  '%s'@'%%t' już istnieje",
-"Drop this user from MySQL." => "Usuń tego użytkownika z MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "Użytkownik '%s'@'localhost' MySQL/MariaDB już istnieje.",
+"Drop this user from MySQL/MariaDB" => "Usuń tego użytkownika z MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "Użytkownik  '%s'@'%%' MySQL/MariaDB już istnieje.",
+"Drop this user from MySQL/MariaDB." => "Usuń tego użytkownika z MySQL/MariaDB",
 "Oracle connection could not be established" => "Nie można ustanowić połączenia z bazą Oracle",
 "Oracle username and/or password not valid" => "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
 "Offending command was: \"%s\", name: %s, password: %s" => "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Ustaw hasło administratora.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
 "Please double check the <a href='%s'>installation guides</a>." => "Sprawdź ponownie <a href='%s'>przewodniki instalacji</a>.",
+"%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
 "Could not find category \"%s\"" => "Nie można odnaleźć kategorii \"%s\"",
 "seconds ago" => "sekund temu",
 "_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"),
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index cc20fb3cb0..6c8ea586de 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Tipo de arquivo desconhecido",
 "Invalid image" => "Imagem inválida",
 "web services under your control" => "serviços web sob seu controle",
-"cannot open \"%s\"" => "não pode abrir \"%s\"",
 "ZIP download is turned off." => "Download ZIP está desligado.",
 "Files need to be downloaded one by one." => "Arquivos precisam ser baixados um de cada vez.",
 "Back to Files" => "Voltar para Arquivos",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Aplicação não está habilitada",
 "Authentication error" => "Erro de autenticação",
 "Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.",
+"Unknown user" => "Usuário desconhecido",
 "Files" => "Arquivos",
 "Text" => "Texto",
 "Images" => "Imagens",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s você não pode usar pontos no nome do banco de dados",
 "MS SQL username and/or password not valid: %s" => "Nome de usuário e/ou senha MS SQL inválido(s): %s",
 "You need to enter either an existing account or the administrator." => "Você precisa inserir uma conta existente ou o administrador.",
-"MySQL username and/or password not valid" => "Nome de usuário e/ou senha MySQL inválido(s)",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB nome de usuário e/ou senha não é válida",
 "DB Error: \"%s\"" => "Erro no BD: \"%s\"",
 "Offending command was: \"%s\"" => "Comando ofensivo era: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "O usuário MySQL '%s'@'localhost' já existe.",
-"Drop this user from MySQL" => "Derrubar este usuário do MySQL",
-"MySQL user '%s'@'%%' already exists" => "Usuário MySQL '%s'@'%%' já existe",
-"Drop this user from MySQL." => "Derrube este usuário do MySQL.",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB usuário '%s'@'localhost' já existe.",
+"Drop this user from MySQL/MariaDB" => "Eliminar esse usuário de MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB usuário '%s'@'%%' já existe",
+"Drop this user from MySQL/MariaDB." => "Eliminar esse usuário de MySQL/MariaDB",
 "Oracle connection could not be established" => "Conexão Oracle não pode ser estabelecida",
 "Oracle username and/or password not valid" => "Nome de usuário e/ou senha Oracle inválido(s)",
 "Offending command was: \"%s\", name: %s, password: %s" => "Comando ofensivo era: \"%s\", nome: %s, senha: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Defina uma senha de administrador.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece estar quebrada.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira os <a href='%s'>guias de instalação</a>.",
+"%s shared »%s« with you" => "%s compartilhou »%s« com você",
 "Could not find category \"%s\"" => "Impossível localizar categoria \"%s\"",
 "seconds ago" => "segundos atrás",
 "_%n minute ago_::_%n minutes ago_" => array("","ha %n minutos"),
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index bd9165ebb1..e6dd459a7e 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Ficheiro desconhecido",
 "Invalid image" => "Imagem inválida",
 "web services under your control" => "serviços web sob o seu controlo",
-"cannot open \"%s\"" => "Não foi possível abrir \"%s\"",
 "ZIP download is turned off." => "Descarregamento em ZIP está desligado.",
 "Files need to be downloaded one by one." => "Os ficheiros precisam de ser descarregados um por um.",
 "Back to Files" => "Voltar a Ficheiros",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "A aplicação não está activada",
 "Authentication error" => "Erro na autenticação",
 "Token expired. Please reload page." => "O token expirou. Por favor recarregue a página.",
+"Unknown user" => "Utilizador desconhecido",
 "Files" => "Ficheiros",
 "Text" => "Texto",
 "Images" => "Imagens",
@@ -40,13 +40,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s não é permitido utilizar pontos (.) no nome da base de dados",
 "MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %s",
 "You need to enter either an existing account or the administrator." => "Precisa de introduzir uma conta existente ou de administrador",
-"MySQL username and/or password not valid" => "Nome de utilizador/password do MySQL inválida",
 "DB Error: \"%s\"" => "Erro na BD: \"%s\"",
 "Offending command was: \"%s\"" => "O comando gerador de erro foi: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "O utilizador '%s'@'localhost' do MySQL já existe.",
-"Drop this user from MySQL" => "Eliminar este utilizador do MySQL",
-"MySQL user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL já existe",
-"Drop this user from MySQL." => "Eliminar este utilizador do MySQL",
 "Oracle connection could not be established" => "Não foi possível estabelecer a ligação Oracle",
 "Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
 "Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
@@ -55,6 +50,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Definiar uma password de administrador",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
+"%s shared »%s« with you" => "%s partilhado »%s« contigo",
 "Could not find category \"%s\"" => "Não foi encontrado a categoria \"%s\"",
 "seconds ago" => "Minutos atrás",
 "_%n minute ago_::_%n minutes ago_" => array("","%n minutos atrás"),
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 94ff7a4326..6bff105a61 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "Images" => "Imagini",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
 "Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
+"%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
 "Could not find category \"%s\"" => "Cloud nu a gasit categoria \"%s\"",
 "seconds ago" => "secunde în urmă",
 "_%n minute ago_::_%n minutes ago_" => array("","","acum %n minute"),
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 34d1730aaf..214849721d 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Неизвестный тип файла",
 "Invalid image" => "Изображение повреждено",
 "web services under your control" => "веб-сервисы под вашим управлением",
-"cannot open \"%s\"" => "не могу открыть \"%s\"",
 "ZIP download is turned off." => "ZIP-скачивание отключено.",
 "Files need to be downloaded one by one." => "Файлы должны быть загружены по одному.",
 "Back to Files" => "Назад к файлам",
@@ -40,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s Вы не можете использовать точки в имени базы данных",
 "MS SQL username and/or password not valid: %s" => "Имя пользователя и/или пароль MS SQL не подходит: %s",
 "You need to enter either an existing account or the administrator." => "Вы должны войти или в существующий аккаунт или под администратором.",
-"MySQL username and/or password not valid" => "Неверное имя пользователя и/или пароль MySQL",
 "DB Error: \"%s\"" => "Ошибка БД: \"%s\"",
 "Offending command was: \"%s\"" => "Вызываемая команда была: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Пользователь MySQL '%s'@'localhost' уже существует.",
-"Drop this user from MySQL" => "Удалить этого пользователя из MySQL",
-"MySQL user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже существует",
-"Drop this user from MySQL." => "Удалить этого пользователя из MySQL.",
 "Oracle connection could not be established" => "соединение с Oracle не может быть установлено",
 "Oracle username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle",
 "Offending command was: \"%s\", name: %s, password: %s" => "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
@@ -55,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "становит пароль для admin.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер до сих пор не настроен правильно для возможности синхронизации файлов, похоже что проблема в неисправности интерфейса WebDAV.",
 "Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
+"%s shared »%s« with you" => "%s поделился »%s« с вами",
 "Could not find category \"%s\"" => "Категория \"%s\"  не найдена",
 "seconds ago" => "несколько секунд назад",
 "_%n minute ago_::_%n minutes ago_" => array("%n минута назад","%n минуты назад","%n минут назад"),
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index 59c45e2b0b..546e301797 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Neznámy typ súboru",
 "Invalid image" => "Chybný obrázok",
 "web services under your control" => "webové služby pod Vašou kontrolou",
-"cannot open \"%s\"" => "nemožno otvoriť \"%s\"",
 "ZIP download is turned off." => "Sťahovanie súborov ZIP je vypnuté.",
 "Files need to be downloaded one by one." => "Súbory musia byť nahrávané jeden za druhým.",
 "Back to Files" => "Späť na súbory",
@@ -40,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "V názve databázy %s nemôžete používať bodky",
 "MS SQL username and/or password not valid: %s" => "Používateľské meno, alebo heslo MS SQL nie je platné: %s",
 "You need to enter either an existing account or the administrator." => "Musíte zadať jestvujúci účet alebo administrátora.",
-"MySQL username and/or password not valid" => "Používateľské meno a/alebo heslo pre MySQL databázu je neplatné",
 "DB Error: \"%s\"" => "Chyba DB: \"%s\"",
 "Offending command was: \"%s\"" => "Podozrivý príkaz bol: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Používateľ '%s'@'localhost' už v MySQL existuje.",
-"Drop this user from MySQL" => "Zahodiť používateľa z MySQL.",
-"MySQL user '%s'@'%%' already exists" => "Používateľ '%s'@'%%' už v MySQL existuje",
-"Drop this user from MySQL." => "Zahodiť používateľa z MySQL.",
 "Oracle connection could not be established" => "Nie je možné pripojiť sa k Oracle",
 "Oracle username and/or password not valid" => "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
 "Offending command was: \"%s\", name: %s, password: %s" => "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s",
@@ -55,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Zadajte heslo administrátora.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
 "Please double check the <a href='%s'>installation guides</a>." => "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
+"%s shared »%s« with you" => "%s s vami zdieľa »%s«",
 "Could not find category \"%s\"" => "Nemožno nájsť danú kategóriu \"%s\"",
 "seconds ago" => "pred sekundami",
 "_%n minute ago_::_%n minutes ago_" => array("pred %n minútou","pred %n minútami","pred %n minútami"),
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 3cc8dd130c..411a14370e 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Neznana vrsta datoteke",
 "Invalid image" => "Neveljavna slika",
 "web services under your control" => "spletne storitve pod vašim nadzorom",
-"cannot open \"%s\"" => "ni mogoče odpreti \"%s\"",
 "ZIP download is turned off." => "Prejemanje datotek v paketu ZIP je onemogočeno.",
 "Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamično.",
 "Back to Files" => "Nazaj na datoteke",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Program ni omogočen",
 "Authentication error" => "Napaka overjanja",
 "Token expired. Please reload page." => "Žeton je potekel. Stran je treba ponovno naložiti.",
+"Unknown user" => "Neznan uporabnik",
 "Files" => "Datoteke",
 "Text" => "Besedilo",
 "Images" => "Slike",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik.",
 "MS SQL username and/or password not valid: %s" => "Uporabniško ime ali geslo MS SQL ni veljavno: %s",
 "You need to enter either an existing account or the administrator." => "Prijaviti se je treba v obstoječi ali pa skrbniški račun.",
-"MySQL username and/or password not valid" => "Uporabniško ime ali geslo MySQL ni veljavno",
+"MySQL/MariaDB username and/or password not valid" => "Uporabniško ime ali geslo za MySQL/MariaDB ni veljavno",
 "DB Error: \"%s\"" => "Napaka podatkovne zbirke: \"%s\"",
 "Offending command was: \"%s\"" => "Napačni ukaz je: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Uporabnik MySQL '%s'@'localhost' že obstaja.",
-"Drop this user from MySQL" => "Odstrani uporabnika iz podatkovne zbirke MySQL",
-"MySQL user '%s'@'%%' already exists" => "Uporabnik MySQL '%s'@'%%' že obstaja.",
-"Drop this user from MySQL." => "Odstrani uporabnika iz podatkovne zbirke MySQL",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "Uporabnik podatkovne zbirke MySQL/MariaDB '%s'@'localhost' že obstaja.",
+"Drop this user from MySQL/MariaDB" => "Odstrani uporabnika iz podatkovne zbirke MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "Uporabnik podatkovne zbirke MySQL/MariaDB '%s'@'%%' že obstaja.",
+"Drop this user from MySQL/MariaDB." => "Odstrani uporabnika iz podatkovne zbirke MySQL/MariaDB.",
 "Oracle connection could not be established" => "Povezave s sistemom Oracle ni mogoče vzpostaviti.",
 "Oracle username and/or password not valid" => "Uporabniško ime ali geslo Oracle ni veljavno",
 "Offending command was: \"%s\", name: %s, password: %s" => "Napačni ukaz je: \"%s\", ime: %s, geslo: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Nastavi geslo skrbnika.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev WebDAV okvarjena.",
 "Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
+"%s shared »%s« with you" => "%s je omogočil souporabo »%s«",
 "Could not find category \"%s\"" => "Kategorije \"%s\" ni mogoče najti.",
 "seconds ago" => "pred nekaj sekundami",
 "_%n minute ago_::_%n minutes ago_" => array("pred %n minuto","pred %n minutama","pred %n minutami","pred %n minutami"),
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index b36aa4ceef..b22663f76d 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -21,13 +21,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s nuk mund të përdorni pikat tek emri i database-it",
 "MS SQL username and/or password not valid: %s" => "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s",
 "You need to enter either an existing account or the administrator." => "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit.",
-"MySQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i MySQL-it i pavlefshëm.",
 "DB Error: \"%s\"" => "Veprim i gabuar i DB-it: \"%s\"",
 "Offending command was: \"%s\"" => "Komanda e gabuar ishte: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Përdoruesi MySQL '%s'@'localhost' ekziston.",
-"Drop this user from MySQL" => "Eliminoni këtë përdorues nga MySQL",
-"MySQL user '%s'@'%%' already exists" => "Përdoruesi MySQL '%s'@'%%' ekziston",
-"Drop this user from MySQL." => "Eliminoni këtë përdorues nga MySQL.",
 "Oracle username and/or password not valid" => "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
 "Offending command was: \"%s\", name: %s, password: %s" => "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s",
 "PostgreSQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm",
@@ -35,6 +30,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Cakto kodin e administratorit.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serveri web i juaji nuk është konfiguruar akoma për të lejuar sinkronizimin e skedarëve sepse ndërfaqja WebDAV mund të jetë e dëmtuar.",
 "Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
+"%s shared »%s« with you" => "%s ndau »%s« me ju",
 "Could not find category \"%s\"" => "Kategoria \"%s\" nuk u gjet",
 "seconds ago" => "sekonda më parë",
 "_%n minute ago_::_%n minutes ago_" => array("","%n minuta më parë"),
diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php
index d8fa928922..3ef62de9ab 100644
--- a/lib/l10n/sr@latin.php
+++ b/lib/l10n/sr@latin.php
@@ -13,7 +13,7 @@ $TRANSLATIONS = array(
 "_%n hour ago_::_%n hours ago_" => array("","",""),
 "today" => "Danas",
 "yesterday" => "juče",
-"_%n day go_::_%n days ago_" => array("","",""),
+"_%n day go_::_%n days ago_" => array("","","Prije %n dana."),
 "last month" => "prošlog meseca",
 "_%n month ago_::_%n months ago_" => array("","",""),
 "last year" => "prošle godine",
diff --git a/lib/l10n/su.php b/lib/l10n/su.php
new file mode 100644
index 0000000000..e7b09649a2
--- /dev/null
+++ b/lib/l10n/su.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"_%n minute ago_::_%n minutes ago_" => array(""),
+"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n day go_::_%n days ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("")
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index ffffe5956f..a1f371210a 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Okänd filtyp",
 "Invalid image" => "Ogiltig bild",
 "web services under your control" => "webbtjänster under din kontroll",
-"cannot open \"%s\"" => "Kan inte öppna \"%s\"",
 "ZIP download is turned off." => "Nerladdning av ZIP är avstängd.",
 "Files need to be downloaded one by one." => "Filer laddas ner en åt gången.",
 "Back to Files" => "Tillbaka till Filer",
@@ -40,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s du får inte använda punkter i databasnamnet",
 "MS SQL username and/or password not valid: %s" => "MS SQL-användaren och/eller lösenordet var inte giltigt: %s",
 "You need to enter either an existing account or the administrator." => "Du måste antingen ange ett befintligt konto eller administratör.",
-"MySQL username and/or password not valid" => "MySQL-användarnamnet och/eller lösenordet är felaktigt",
 "DB Error: \"%s\"" => "DB error: \"%s\"",
 "Offending command was: \"%s\"" => "Det felaktiga kommandot var: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL-användaren '%s'@'localhost' existerar redan.",
-"Drop this user from MySQL" => "Radera denna användare från MySQL",
-"MySQL user '%s'@'%%' already exists" => "MySQl-användare '%s'@'%%' existerar redan",
-"Drop this user from MySQL." => "Radera denna användare från MySQL.",
 "Oracle connection could not be established" => "Oracle-anslutning kunde inte etableras",
 "Oracle username and/or password not valid" => "Oracle-användarnamnet och/eller lösenordet är felaktigt",
 "Offending command was: \"%s\", name: %s, password: %s" => "Det felande kommandot var: \"%s\", name: %s, password: %s",
@@ -55,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Ange ett administratörslösenord.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
 "Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
+"%s shared »%s« with you" => "%s delade »%s« med dig",
 "Could not find category \"%s\"" => "Kunde inte hitta kategorin \"%s\"",
 "seconds ago" => "sekunder sedan",
 "_%n minute ago_::_%n minutes ago_" => array("%n minut sedan","%n minuter sedan"),
diff --git a/lib/l10n/te.php b/lib/l10n/te.php
index 524ea0c602..12ae924019 100644
--- a/lib/l10n/te.php
+++ b/lib/l10n/te.php
@@ -1,16 +1,17 @@
 <?php
 $TRANSLATIONS = array(
 "Help" => "సహాయం",
+"Personal" => "వ్యక్తిగతం",
 "Settings" => "అమరికలు",
 "Users" => "వాడుకరులు",
 "seconds ago" => "క్షణాల క్రితం",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("","%n నిమిషాల క్రితం"),
+"_%n hour ago_::_%n hours ago_" => array("","%n గంటల క్రితం"),
 "today" => "ఈరోజు",
 "yesterday" => "నిన్న",
-"_%n day go_::_%n days ago_" => array("",""),
+"_%n day go_::_%n days ago_" => array("","%n రోజుల క్రితం"),
 "last month" => "పోయిన నెల",
-"_%n month ago_::_%n months ago_" => array("",""),
+"_%n month ago_::_%n months ago_" => array("","%n నెలల క్రితం"),
 "last year" => "పోయిన సంవత్సరం",
 "years ago" => "సంవత్సరాల క్రితం"
 );
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 7d25836f7d..2fce8b87bf 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -11,7 +11,6 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Bilinmeyen dosya türü",
 "Invalid image" => "Geçersiz resim",
 "web services under your control" => "kontrolünüzün altındaki web hizmetleri",
-"cannot open \"%s\"" => "\"%s\" açılamıyor",
 "ZIP download is turned off." => "ZIP indirmeleri kapatıldı.",
 "Files need to be downloaded one by one." => "Dosyaların birer birer indirilmesi gerekmektedir.",
 "Back to Files" => "Dosyalara dön",
@@ -32,6 +31,7 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Uygulama etkinleştirilmedi",
 "Authentication error" => "Kimlik doğrulama hatası",
 "Token expired. Please reload page." => "Jetonun süresi geçti. Lütfen sayfayı yenileyin.",
+"Unknown user" => "Bilinmeyen kullanıcı",
 "Files" => "Dosyalar",
 "Text" => "Metin",
 "Images" => "Resimler",
@@ -40,13 +40,13 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s veritabanı adında nokta kullanamayabilirsiniz",
 "MS SQL username and/or password not valid: %s" => "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s",
 "You need to enter either an existing account or the administrator." => "Bir konto veya kullanici birlemek ihtiyacin. ",
-"MySQL username and/or password not valid" => "MySQL kullanıcı adı ve/veya parolası geçerli değil",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB kullanıcı adı ve/veya parolası geçersiz",
 "DB Error: \"%s\"" => "DB Hata: ''%s''",
 "Offending command was: \"%s\"" => "Komut rahasiz ''%s''. ",
-"MySQL user '%s'@'localhost' exists already." => "MySQL kullanici '%s @local host zatan var. ",
-"Drop this user from MySQL" => "Bu kullanici MySQLden list disari koymak. ",
-"MySQL user '%s'@'%%' already exists" => "MySQL kullanici '%s @ % % zaten var (zaten yazili)",
-"Drop this user from MySQL." => "Bu kullanıcıyı MySQL veritabanından kaldır",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB kullanıcı '%s'@'localhost' zaten mevcut.",
+"Drop this user from MySQL/MariaDB" => "Bu kullanıcıyı MySQL/MariaDB'dan at (drop)",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB kullanıcısı '%s'@'%%' zaten mevcut",
+"Drop this user from MySQL/MariaDB." => "Bu kullanıcıyı MySQL/MariaDB'dan at (drop)",
 "Oracle connection could not be established" => "Oracle bağlantısı kurulamadı",
 "Oracle username and/or password not valid" => "Adi klullanici ve/veya parola Oracle mantikli değildir. ",
 "Offending command was: \"%s\", name: %s, password: %s" => "Hatalı komut: \"%s\", ad: %s, parola: %s",
@@ -55,6 +55,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Parola yonetici birlemek. ",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.",
 "Please double check the <a href='%s'>installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> iki kez kontrol edin.",
+"%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu",
 "Could not find category \"%s\"" => "\"%s\" kategorisi bulunamadı",
 "seconds ago" => "saniye önce",
 "_%n minute ago_::_%n minutes ago_" => array("","%n dakika önce"),
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 32e010f1d4..94163f0b6f 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -23,13 +23,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s не можна використовувати крапки в назві бази даних",
 "MS SQL username and/or password not valid: %s" => "MS SQL ім'я користувача та/або пароль не дійсні: %s",
 "You need to enter either an existing account or the administrator." => "Вам потрібно ввести або існуючий обліковий запис або administrator.",
-"MySQL username and/or password not valid" => "MySQL ім'я користувача та/або пароль не дійсні",
 "DB Error: \"%s\"" => "Помилка БД: \"%s\"",
 "Offending command was: \"%s\"" => "Команда, що викликала проблему: \"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "Користувач MySQL '%s'@'localhost' вже існує.",
-"Drop this user from MySQL" => "Видалити цього користувача з MySQL",
-"MySQL user '%s'@'%%' already exists" => "Користувач MySQL '%s'@'%%' вже існує",
-"Drop this user from MySQL." => "Видалити цього користувача з MySQL.",
 "Oracle username and/or password not valid" => "Oracle ім'я користувача та/або пароль не дійсні",
 "Offending command was: \"%s\", name: %s, password: %s" => "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s",
 "PostgreSQL username and/or password not valid" => "PostgreSQL ім'я користувача та/або пароль не дійсні",
@@ -37,6 +32,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "Встановіть пароль адміністратора.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
 "Please double check the <a href='%s'>installation guides</a>." => "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
+"%s shared »%s« with you" => "%s розподілено »%s« з тобою",
 "Could not find category \"%s\"" => "Не вдалося знайти категорію \"%s\"",
 "seconds ago" => "секунди тому",
 "_%n minute ago_::_%n minutes ago_" => array("","","%n хвилин тому"),
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
index 5840283110..c3e09e9631 100644
--- a/lib/l10n/vi.php
+++ b/lib/l10n/vi.php
@@ -5,6 +5,8 @@ $TRANSLATIONS = array(
 "Settings" => "Cài đặt",
 "Users" => "Người dùng",
 "Admin" => "Quản trị",
+"Unknown filetype" => "Không biết kiểu tập tin",
+"Invalid image" => "Hình ảnh không hợp lệ",
 "web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
 "ZIP download is turned off." => "Tải về ZIP đã bị tắt.",
 "Files need to be downloaded one by one." => "Tập tin cần phải được tải về từng người một.",
@@ -16,15 +18,16 @@ $TRANSLATIONS = array(
 "Files" => "Tập tin",
 "Text" => "Văn bản",
 "Images" => "Hình ảnh",
+"%s shared »%s« with you" => "%s đã chia sẻ »%s« với bạn",
 "Could not find category \"%s\"" => "không thể tìm thấy mục \"%s\"",
 "seconds ago" => "vài giây trước",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
+"_%n minute ago_::_%n minutes ago_" => array("%n phút trước"),
+"_%n hour ago_::_%n hours ago_" => array("%n giờ trước"),
 "today" => "hôm nay",
 "yesterday" => "hôm qua",
-"_%n day go_::_%n days ago_" => array(""),
+"_%n day go_::_%n days ago_" => array("%n ngày trước"),
 "last month" => "tháng trước",
-"_%n month ago_::_%n months ago_" => array(""),
+"_%n month ago_::_%n months ago_" => array("%n tháng trước"),
 "last year" => "năm trước",
 "years ago" => "năm trước"
 );
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index ae9243cf41..684ee17f98 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Settings" => "设置",
 "Users" => "用户",
 "Admin" => "管理",
+"Failed to upgrade \"%s\"." => "\"%s\" 升级失败。",
 "Unknown filetype" => "未知的文件类型",
 "Invalid image" => "无效的图像",
 "web services under your control" => "您控制的web服务",
@@ -13,6 +14,8 @@ $TRANSLATIONS = array(
 "Back to Files" => "回到文件",
 "Selected files too large to generate zip file." => "选择的文件太大，无法生成 zip 文件。",
 "App does not provide an info.xml file" => "应用未提供 info.xml 文件",
+"App directory already exists" => "应用程序目录已存在",
+"Can't create app folder. Please fix permissions. %s" => "无法创建应用程序文件夹。请修正权限。%s",
 "Application is not enabled" => "应用程序未启用",
 "Authentication error" => "认证出错",
 "Token expired. Please reload page." => "Token 过期，请刷新页面。",
@@ -24,13 +27,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s 您不能在数据库名称中使用英文句号。",
 "MS SQL username and/or password not valid: %s" => "MS SQL 用户名和/或密码无效：%s",
 "You need to enter either an existing account or the administrator." => "你需要输入一个数据库中已有的账户或管理员账户。",
-"MySQL username and/or password not valid" => "MySQL 数据库用户名和/或密码无效",
 "DB Error: \"%s\"" => "数据库错误：\"%s\"",
 "Offending command was: \"%s\"" => "冲突命令为：\"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL 用户 '%s'@'localhost' 已存在。",
-"Drop this user from MySQL" => "建议从 MySQL 数据库中丢弃 Drop 此用户",
-"MySQL user '%s'@'%%' already exists" => "MySQL 用户 '%s'@'%%' 已存在",
-"Drop this user from MySQL." => "建议从 MySQL 数据库中丢弃 Drop 此用户。",
 "Oracle connection could not be established" => "不能建立甲骨文连接",
 "Oracle username and/or password not valid" => "Oracle 数据库用户名和/或密码无效",
 "Offending command was: \"%s\", name: %s, password: %s" => "冲突命令为：\"%s\"，名称：%s，密码：%s",
@@ -39,6 +37,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "请设置一个管理员密码。",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
 "Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
+"%s shared »%s« with you" => "%s 向您分享了 »%s«",
 "Could not find category \"%s\"" => "无法找到分类 \"%s\"",
 "seconds ago" => "秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 35719c8b17..1fbae6e235 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -11,11 +11,11 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "未知的檔案類型",
 "Invalid image" => "無效的圖片",
 "web services under your control" => "由您控制的網路服務",
-"cannot open \"%s\"" => "無法開啓 %s",
 "ZIP download is turned off." => "ZIP 下載已關閉。",
 "Files need to be downloaded one by one." => "檔案需要逐一下載。",
 "Back to Files" => "回到檔案列表",
 "Selected files too large to generate zip file." => "選擇的檔案太大以致於無法產生壓縮檔。",
+"Please download the files separately in smaller chunks or kindly ask your administrator." => "請分割您的檔案後下載，或請詢問您的系統管理員。",
 "No source specified when installing app" => "沒有指定應用程式安裝來源",
 "No href specified when installing app from http" => "從 http 安裝應用程式，找不到 href 屬性",
 "No path specified when installing app from local file" => "從本地檔案安裝應用程式時沒有指定路徑",
@@ -39,13 +39,8 @@ $TRANSLATIONS = array(
 "%s you may not use dots in the database name" => "%s 資料庫名稱不能包含小數點",
 "MS SQL username and/or password not valid: %s" => "MS SQL 使用者和/或密碼無效：%s",
 "You need to enter either an existing account or the administrator." => "您必須輸入一個現有的帳號或管理員帳號。",
-"MySQL username and/or password not valid" => "MySQL 用戶名和/或密碼無效",
 "DB Error: \"%s\"" => "資料庫錯誤：\"%s\"",
 "Offending command was: \"%s\"" => "有問題的指令是：\"%s\"",
-"MySQL user '%s'@'localhost' exists already." => "MySQL 使用者 '%s'@'localhost' 已經存在。",
-"Drop this user from MySQL" => "在 MySQL 移除這個使用者",
-"MySQL user '%s'@'%%' already exists" => "MySQL 使用者 '%s'@'%%' 已經存在",
-"Drop this user from MySQL." => "在 MySQL 移除這個使用者。",
 "Oracle connection could not be established" => "無法建立 Oracle 資料庫連線",
 "Oracle username and/or password not valid" => "Oracle 用戶名和/或密碼無效",
 "Offending command was: \"%s\", name: %s, password: %s" => "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\"",
@@ -54,6 +49,7 @@ $TRANSLATIONS = array(
 "Set an admin password." => "設定管理員密碼。",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的網頁伺服器尚未被正確設定來進行檔案同步，因為您的 WebDAV 界面似乎無法使用。",
 "Please double check the <a href='%s'>installation guides</a>." => "請參考<a href='%s'>安裝指南</a>。",
+"%s shared »%s« with you" => "%s 與您分享了 %s",
 "Could not find category \"%s\"" => "找不到分類：\"%s\"",
 "seconds ago" => "幾秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分鐘前"),
diff --git a/lib/private/api.php b/lib/private/api.php
index 3f96196e6d..b3b5eb1067 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -65,8 +65,8 @@ class OC_API {
 		$name = strtolower($method).$url;
 		$name = str_replace(array('/', '{', '}'), '_', $name);
 		if(!isset(self::$actions[$name])) {
-			OC::getRouter()->useCollection('ocs');
-			OC::getRouter()->create($name, $url)
+			OC::$server->getRouter()->useCollection('ocs');
+			OC::$server->getRouter()->create($name, $url)
 				->method($method)
 				->defaults($defaults)
 				->requirements($requirements)
@@ -116,9 +116,7 @@ class OC_API {
 				);
 		}
 		$response = self::mergeResponses($responses);
-		$formats = array('json', 'xml');
-
-		$format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml';
+		$format = self::requestedFormat();
 		if (self::$logoutRequired) {
 			OC_User::logout();
 		}
@@ -270,6 +268,18 @@ class OC_API {
 	 * @return string|false (username, or false on failure)
 	 */
 	private static function loginUser(){
+
+		// reuse existing login
+		$loggedIn = OC_User::isLoggedIn();
+		$ocsApiRequest = isset($_SERVER['HTTP_OCS_APIREQUEST']) ? $_SERVER['HTTP_OCS_APIREQUEST'] === 'true' : false;
+		if ($loggedIn === true && $ocsApiRequest) {
+
+			// initialize the user's filesystem
+			\OC_Util::setUpFS(\OC_User::getUser());
+
+			return OC_User::getUser();
+		}
+
 		// basic auth
 		$authUser = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : '';
 		$authPw = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
@@ -283,17 +293,6 @@ class OC_API {
 			return $authUser;
 		}
 
-		// reuse existing login
-		$loggedIn = OC_User::isLoggedIn();
-		$ocsApiRequest = isset($_SERVER['HTTP_OCS_APIREQUEST']) ? $_SERVER['HTTP_OCS_APIREQUEST'] === 'true' : false;
-		if ($loggedIn === true && $ocsApiRequest) {
-
-			// initialize the user's filesystem
-			\OC_Util::setUpFS(\OC_User::getUser());
-
-			return OC_User::getUser();
-		}
-
 		return false;
 	}
 
@@ -349,4 +348,33 @@ class OC_API {
 		}
 	}
 
+	/**
+	 * @return string
+	 */
+	public static function requestedFormat() {
+		$formats = array('json', 'xml');
+
+		$format = !empty($_GET['format']) && in_array($_GET['format'], $formats) ? $_GET['format'] : 'xml';
+		return $format;
+	}
+
+	/**
+	 * Based on the requested format the response content type is set
+	 */
+	public static function setContentType() {
+		$format = \OC_API::requestedFormat();
+		if ($format === 'xml') {
+			header('Content-type: text/xml; charset=UTF-8');
+			return;
+		}
+
+		if ($format === 'json') {
+			header('Content-Type: application/json; charset=utf-8');
+			return;
+		}
+
+		header('Content-Type: application/octet-stream; charset=utf-8');
+	}
+
+
 }
diff --git a/lib/private/app.php b/lib/private/app.php
index 048d4d4aeb..58bf67c1d4 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -219,6 +219,8 @@ class OC_App{
 				$appdata=OC_OCSClient::getApplication($app);
 				$download=OC_OCSClient::getApplicationDownload($app, 1);
 				if(isset($download['downloadlink']) and $download['downloadlink']!='') {
+					// Replace spaces in download link without encoding entire URL
+					$download['downloadlink'] = str_replace(' ', '%20', $download['downloadlink']);
 					$info = array('source'=>'http', 'href'=>$download['downloadlink'], 'appdata'=>$appdata);
 					$app=OC_Installer::installApp($info);
 				}
diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php
index 716358444a..35bee75cc4 100644
--- a/lib/private/appframework/routing/routeconfig.php
+++ b/lib/private/appframework/routing/routeconfig.php
@@ -23,6 +23,7 @@
 namespace OC\AppFramework\routing;
 
 use OC\AppFramework\DependencyInjection\DIContainer;
+use OCP\Route\IRouter;
 
 /**
  * Class RouteConfig
@@ -36,10 +37,10 @@ class RouteConfig {
 
 	/**
 	 * @param \OC\AppFramework\DependencyInjection\DIContainer $container
-	 * @param \OC_Router $router
+	 * @param \OCP\Route\IRouter $router
 	 * @internal param $appName
 	 */
-	public function __construct(DIContainer $container, \OC_Router $router, $routes) {
+	public function __construct(DIContainer $container, IRouter $router, $routes) {
 		$this->routes = $routes;
 		$this->container = $container;
 		$this->router = $router;
@@ -47,7 +48,7 @@ class RouteConfig {
 	}
 
 	/**
-	 * The routes and resource will be registered to the \OC_Router
+	 * The routes and resource will be registered to the \OCP\Route\IRouter
 	 */
 	public function register() {
 
diff --git a/lib/private/cache/file.php b/lib/private/cache/file.php
index 8a6ef39f61..be6805a9a5 100644
--- a/lib/private/cache/file.php
+++ b/lib/private/cache/file.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -10,22 +11,22 @@ namespace OC\Cache;
 
 class File {
 	protected $storage;
+
+	/**
+	 * Returns the cache storage for the logged in user
+	 * @return cache storage
+	 */
 	protected function getStorage() {
 		if (isset($this->storage)) {
 			return $this->storage;
 		}
 		if(\OC_User::isLoggedIn()) {
 			\OC\Files\Filesystem::initMountPoints(\OC_User::getUser());
-			$subdir = 'cache';
-			$view = new \OC\Files\View('/' . \OC_User::getUser());
-			if(!$view->file_exists($subdir)) {
-				$view->mkdir($subdir);
-			}
-			$this->storage = new \OC\Files\View('/' . \OC_User::getUser().'/'.$subdir);
+			$this->storage = new \OC\Files\View('/' . \OC_User::getUser() . '/cache');
 			return $this->storage;
 		}else{
 			\OC_Log::write('core', 'Can\'t get cache storage, user not logged in', \OC_Log::ERROR);
-			return false;
+			throw new \OC\ForbiddenException('Can\t get cache storage, user not logged in');
 		}
 	}
 
diff --git a/lib/private/config.php b/lib/private/config.php
index 3649da8497..56f4725613 100644
--- a/lib/private/config.php
+++ b/lib/private/config.php
@@ -77,7 +77,7 @@ class Config {
 	/**
 	 * @brief Gets a value from config.php
 	 * @param string $key key
-	 * @param string|null $default = null default value
+	 * @param array|bool|string|null $default = null default value
 	 * @return string the value or $default
 	 *
 	 * This function gets the value from config.php. If it does not exist,
diff --git a/lib/private/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php
index 0c84fa6b75..5577273df8 100644
--- a/lib/private/connector/sabre/auth.php
+++ b/lib/private/connector/sabre/auth.php
@@ -73,6 +73,20 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	  */
 	public function authenticate(Sabre_DAV_Server $server, $realm) {
 
+		$result = $this->auth($server, $realm);
+
+		// close the session - right after authentication there is not need to write to the session any more
+		\OC::$session->close();
+
+		return $result;
+    }
+
+	/**
+	 * @param Sabre_DAV_Server $server
+	 * @param $realm
+	 * @return bool
+	 */
+	private function auth(Sabre_DAV_Server $server, $realm) {
 		if (OC_User::handleApacheAuth() || OC_User::isLoggedIn()) {
 			$user = OC_User::getUser();
 			OC_Util::setupFS($user);
@@ -81,5 +95,5 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 		}
 
 		return parent::authenticate($server, $realm);
-    }
+	}
 }
diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index 02d1a9f4ba..3ed9e94d69 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -50,7 +50,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 */
 	public function createFile($name, $data = null) {
 
-		if ($name === 'Shared' && empty($this->path)) {
+		if (strtolower($name) === 'shared' && empty($this->path)) {
 			throw new \Sabre_DAV_Exception_Forbidden();
 		}
 
@@ -86,7 +86,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 */
 	public function createDirectory($name) {
 
-		if ($name === 'Shared' && empty($this->path)) {
+		if (strtolower($name) === 'shared' && empty($this->path)) {
 			throw new \Sabre_DAV_Exception_Forbidden();
 		}
 
diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php
index d2fa425b22..accf020daa 100644
--- a/lib/private/connector/sabre/objecttree.php
+++ b/lib/private/connector/sabre/objecttree.php
@@ -94,6 +94,9 @@ class ObjectTree extends \Sabre_DAV_ObjectTree {
 		}
 		if ($sourceDir !== $destinationDir) {
 			// for a full move we need update privileges on sourcePath and sourceDir as well as destinationDir
+			if (ltrim($destinationDir, '/') === '' && strtolower($sourceNode->getName()) === 'shared') {
+				throw new \Sabre_DAV_Exception_Forbidden();
+			}
 			if (!$fs->isUpdatable($sourceDir)) {
 				throw new \Sabre_DAV_Exception_Forbidden();
 			}
diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
index f9a76786c3..1c16d03eab 100644
--- a/lib/private/db/mdb2schemareader.php
+++ b/lib/private/db/mdb2schemareader.php
@@ -41,7 +41,9 @@ class MDB2SchemaReader {
 	 */
 	public function loadSchemaFromFile($file) {
 		$schema = new \Doctrine\DBAL\Schema\Schema();
+		$loadEntities = libxml_disable_entity_loader(false);
 		$xml = simplexml_load_file($file);
+		libxml_disable_entity_loader($loadEntities);
 		foreach ($xml->children() as $child) {
 			/**
 			 * @var \SimpleXMLElement $child
diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index eaf215c723..492209b883 100644
--- a/lib/private/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
@@ -8,6 +8,11 @@
 
 /**
  * small wrapper around \Doctrine\DBAL\Driver\Statement to make it behave, more like an MDB2 Statement
+ *
+ * @method boolean bindValue(mixed $param, mixed $value, integer $type = null);
+ * @method string errorCode();
+ * @method array errorInfo();
+ * @method integer rowCount();
  */
 class OC_DB_StatementWrapper {
 	/**
@@ -161,6 +166,8 @@ class OC_DB_StatementWrapper {
     
 	/**
 	 * provide an alias for fetch
+	 *
+	 * @return mixed
 	 */
 	public function fetchRow() {
 		return $this->statement->fetch();
@@ -168,12 +175,13 @@ class OC_DB_StatementWrapper {
 
 	/**
 	 * Provide a simple fetchOne.
+	 *
 	 * fetch single column from the next row
-	 * @param int $colnum the column number to fetch
+	 * @param int $column the column number to fetch
 	 * @return string
 	 */
-	public function fetchOne($colnum = 0) {
-		return $this->statement->fetchColumn($colnum);
+	public function fetchOne($column = 0) {
+		return $this->statement->fetchColumn($column);
 	}
 
 	/**
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index 59630cda5c..79be211b82 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -21,6 +21,7 @@ class OC_Defaults {
 	private $defaultDocBaseUrl;
 	private $defaultSlogan;
 	private $defaultLogoClaim;
+	private $defaultMailHeaderColor;
 
 	function __construct() {
 		$this->l = OC_L10N::get('core');
@@ -33,6 +34,7 @@ class OC_Defaults {
 		$this->defaultDocBaseUrl = "http://doc.owncloud.org";
 		$this->defaultSlogan = $this->l->t("web services under your control");
 		$this->defaultLogoClaim = "";
+		$this->defaultMailHeaderColor = "#1d2d44"; /* header color of mail notifications */
 
 		if (class_exists("OC_Theme")) {
 			$this->theme = new OC_Theme();
@@ -181,4 +183,16 @@ class OC_Defaults {
 		return $this->getDocBaseUrl() . '/server/6.0/go.php?to=' . $key;
 	}
 
+	/**
+	 * Returns mail header color
+	 * @return mail header color
+	 */
+	public function getMailHeaderColor() {
+		if ($this->themeExist('getMailHeaderColor')) {
+			return $this->theme->getMailHeaderColor();
+		} else {
+			return $this->defaultMailHeaderColor;
+		}
+	}
+
 }
diff --git a/lib/private/eventsource.php b/lib/private/eventsource.php
index 4df0bc2e7c..5a41ddd8b3 100644
--- a/lib/private/eventsource.php
+++ b/lib/private/eventsource.php
@@ -63,8 +63,9 @@ class OC_EventSource{
 			$type=null;
 		}
 		if($this->fallback) {
+			$fallBackId = OC_Util::sanitizeHTML($this->fallBackId);
 			$response='<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('
-				.$this->fallBackId.',"' . $type . '",' . OCP\JSON::encode($data) . ')</script>' . PHP_EOL;
+				.$fallBackId.',"' . $type . '",' . OCP\JSON::encode($data) . ')</script>' . PHP_EOL;
 			echo $response;
 		}else{
 			if($type) {
diff --git a/lib/private/files.php b/lib/private/files.php
index 7e7a27f48d..bfe6d3c02d 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -148,8 +148,9 @@ class OC_Files {
 			set_time_limit($executionTime);
 		} else {
 			if ($xsendfile) {
+				$view = \OC\Files\Filesystem::getView();
 				/** @var $storage \OC\Files\Storage\Storage */
-				list($storage) = \OC\Files\Filesystem::resolvePath($filename);
+				list($storage) = $view->resolvePath($filename);
 				if ($storage->isLocal()) {
 					self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
 				} else {
diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 9b18257088..abc11e7647 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -498,9 +498,10 @@ class Cache {
 	 * update the folder size and the size of all parent folders
 	 *
 	 * @param string|boolean $path
+	 * @param array $data (optional) meta data of the folder
 	 */
-	public function correctFolderSize($path) {
-		$this->calculateFolderSize($path);
+	public function correctFolderSize($path, $data = null) {
+		$this->calculateFolderSize($path, $data);
 		if ($path !== '') {
 			$parent = dirname($path);
 			if ($parent === '.' or $parent === '/') {
@@ -514,11 +515,14 @@ class Cache {
 	 * get the size of a folder and set it in the cache
 	 *
 	 * @param string $path
+	 * @param array $entry (optional) meta data of the folder
 	 * @return int
 	 */
-	public function calculateFolderSize($path) {
+	public function calculateFolderSize($path, $entry = null) {
 		$totalSize = 0;
-		$entry = $this->get($path);
+		if (is_null($entry) or !isset($entry['fileid'])) {
+			$entry = $this->get($path);
+		}
 		if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
 			$id = $entry['fileid'];
 			$sql = 'SELECT SUM(`size`) AS f1, MIN(`size`) AS f2, ' .
@@ -540,7 +544,7 @@ class Cache {
 				if ($entry['size'] !== $totalSize) {
 					$update['size'] = $totalSize;
 				}
-				if ($entry['unencrypted_size'] !== $unencryptedSum) {
+				if (!isset($entry['unencrypted_size']) or $entry['unencrypted_size'] !== $unencryptedSum) {
 					$update['unencrypted_size'] = $unencryptedSum;
 				}
 				if (count($update) > 0) {
diff --git a/lib/private/files/cache/homecache.php b/lib/private/files/cache/homecache.php
index a7c310a378..2326c46e8d 100644
--- a/lib/private/files/cache/homecache.php
+++ b/lib/private/files/cache/homecache.php
@@ -13,26 +13,37 @@ class HomeCache extends Cache {
 	 * get the size of a folder and set it in the cache
 	 *
 	 * @param string $path
+	 * @param array $entry (optional) meta data of the folder
 	 * @return int
 	 */
-	public function calculateFolderSize($path) {
-		if ($path !== '/' and $path !== '' and $path !== 'files') {
-			return parent::calculateFolderSize($path);
+	public function calculateFolderSize($path, $entry = null) {
+		if ($path !== '/' and $path !== '' and $path !== 'files' and $path !== 'files_trashbin') {
+			return parent::calculateFolderSize($path, $entry);
+		} elseif ($path === '' or $path === '/') {
+			// since the size of / isn't used (the size of /files is used instead) there is no use in calculating it
+			return 0;
 		}
 
 		$totalSize = 0;
-		$entry = $this->get($path);
+		if (is_null($entry)) {
+			$entry = $this->get($path);
+		}
 		if ($entry && $entry['mimetype'] === 'httpd/unix-directory') {
 			$id = $entry['fileid'];
-			$sql = 'SELECT SUM(`size`) FROM `*PREFIX*filecache` ' .
+			$sql = 'SELECT SUM(`size`) AS f1, ' .
+			   'SUM(`unencrypted_size`) AS f2 FROM `*PREFIX*filecache` ' .
 				'WHERE `parent` = ? AND `storage` = ? AND `size` >= 0';
 			$result = \OC_DB::executeAudited($sql, array($id, $this->getNumericStorageId()));
 			if ($row = $result->fetchRow()) {
-				list($sum) = array_values($row);
+				list($sum, $unencryptedSum) = array_values($row);
 				$totalSize = (int)$sum;
+				$unencryptedSize = (int)$unencryptedSum;
 				if ($entry['size'] !== $totalSize) {
 					$this->update($id, array('size' => $totalSize));
 				}
+				if ($entry['unencrypted_size'] !== $unencryptedSize) {
+					$this->update($id, array('unencrypted_size' => $unencryptedSize));
+				}
 			}
 		}
 		return $totalSize;
@@ -40,6 +51,7 @@ class HomeCache extends Cache {
 
 	/**
 	 * @param string $path
+	 * @return array
 	 */
 	public function get($path) {
 		$data = parent::get($path);
diff --git a/lib/private/files/cache/legacy.php b/lib/private/files/cache/legacy.php
deleted file mode 100644
index 4d5f58741e..0000000000
--- 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/scanner.php b/lib/private/files/cache/scanner.php
index 92a4c01841..79159724d1 100644
--- a/lib/private/files/cache/scanner.php
+++ b/lib/private/files/cache/scanner.php
@@ -155,7 +155,7 @@ class Scanner extends BasicEmitter {
 					}
 				}
 				if (!empty($newData)) {
-					$this->cache->put($file, $newData);
+					$data['fileid'] = $this->cache->put($file, $newData);
 					$this->emit('\OC\Files\Cache\Scanner', 'postScanFile', array($file, $this->storageId));
 					\OC_Hook::emit('\OC\Files\Cache\Scanner', 'post_scan_file', array('path' => $file, 'storage' => $this->storageId));
 				}
@@ -173,14 +173,16 @@ class Scanner extends BasicEmitter {
 	 * @param string $path
 	 * @param bool $recursive
 	 * @param int $reuse
-	 * @return int the size of the scanned folder or -1 if the size is unknown at this stage
+	 * @return array with the meta data of the scanned file or folder
 	 */
 	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1) {
 		if ($reuse === -1) {
 			$reuse = ($recursive === self::SCAN_SHALLOW) ? self::REUSE_ETAG | self::REUSE_SIZE : 0;
 		}
-		$this->scanFile($path, $reuse);
-		return $this->scanChildren($path, $recursive, $reuse);
+		$data = $this->scanFile($path, $reuse);
+		$size = $this->scanChildren($path, $recursive, $reuse);
+		$data['size'] = $size;
+		return $data;
 	}
 
 	/**
diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index 7a45b9e9e9..199ce5dee7 100644
--- a/lib/private/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
@@ -38,8 +38,8 @@ class Updater {
 		if ($storage) {
 			$cache = $storage->getCache($internalPath);
 			$scanner = $storage->getScanner($internalPath);
-			$scanner->scan($internalPath, Scanner::SCAN_SHALLOW);
-			$cache->correctFolderSize($internalPath);
+			$data = $scanner->scan($internalPath, Scanner::SCAN_SHALLOW);
+			$cache->correctFolderSize($internalPath, $data);
 			self::correctFolder($path, $storage->filemtime($internalPath));
 			self::correctParentStorageMtime($storage, $internalPath);
 		}
@@ -119,6 +119,9 @@ class Updater {
 
 		if ($uid != \OCP\User::getUser()) {
 			$info = \OC\Files\Filesystem::getFileInfo($filename);
+			if (!$info) {
+				return array($uid, '/files/' . $filename);
+			}
 			$ownerView = new \OC\Files\View('/' . $uid . '/files');
 			$filename = $ownerView->getPath($info['fileid']);
 		}
@@ -150,7 +153,7 @@ class Updater {
 				$cache->update($id, array('mtime' => $time, 'etag' => $storage->getETag($internalPath)));
 				if ($realPath !== '') {
 					$realPath = dirname($realPath);
-					if($realPath === DIRECTORY_SEPARATOR ) {
+					if ($realPath === DIRECTORY_SEPARATOR) {
 						$realPath = "";
 					}
 					// check storage for parent in case we change the storage in this step
diff --git a/lib/private/files/cache/upgrade.php b/lib/private/files/cache/upgrade.php
deleted file mode 100644
index e3a46896cb..0000000000
--- 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/files/fileinfo.php b/lib/private/files/fileinfo.php
index 2dbdd80a26..d6940f50bf 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -53,7 +53,13 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	}
 
 	public function offsetGet($offset) {
-		return $this->data[$offset];
+		if ($offset === 'type') {
+			return $this->getType();
+		} elseif (isset($this->data[$offset])) {
+			return $this->data[$offset];
+		} else {
+			return null;
+		}
 	}
 
 	/**
@@ -144,10 +150,14 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	 * @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
 	 */
 	public function getType() {
-		return $this->data['type'];
+		if (isset($this->data['type'])) {
+			return $this->data['type'];
+		} else {
+			return $this->getMimetype() === 'httpd/unix-directory' ? self::TYPE_FOLDER : self::TYPE_FILE;
+		}
 	}
 
-	public function getData(){
+	public function getData() {
 		return $this->data;
 	}
 
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 7f7b6f7f46..7e27650c55 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -320,79 +320,34 @@ class Filesystem {
 		else {
 			self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user);
 		}
-		$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
-		$mount_file = \OC_Config::getValue("mount_file", $datadir . "/mount.json");
 
-		//move config file to it's new position
-		if (is_file(\OC::$SERVERROOT . '/config/mount.json')) {
-			rename(\OC::$SERVERROOT . '/config/mount.json', $mount_file);
-		}
-		// Load system mount points
-		if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file($mount_file)) {
-			if (is_file($mount_file)) {
-				$mountConfig = json_decode(file_get_contents($mount_file), true);
-			} elseif (is_file(\OC::$SERVERROOT . '/config/mount.php')) {
-				$mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php'));
-			}
-			if (isset($mountConfig['global'])) {
-				foreach ($mountConfig['global'] as $mountPoint => $options) {
-					self::mount($options['class'], $options['options'], $mountPoint);
-				}
-			}
-			if (isset($mountConfig['group'])) {
-				foreach ($mountConfig['group'] as $group => $mounts) {
-					if (\OC_Group::inGroup($user, $group)) {
-						foreach ($mounts as $mountPoint => $options) {
-							$mountPoint = self::setUserVars($user, $mountPoint);
-							foreach ($options as &$option) {
-								$option = self::setUserVars($user, $option);
-							}
-							self::mount($options['class'], $options['options'], $mountPoint);
-						}
-					}
-				}
-			}
-			if (isset($mountConfig['user'])) {
-				foreach ($mountConfig['user'] as $mountUser => $mounts) {
-					if ($mountUser === 'all' or strtolower($mountUser) === strtolower($user)) {
-						foreach ($mounts as $mountPoint => $options) {
-							$mountPoint = self::setUserVars($user, $mountPoint);
-							foreach ($options as &$option) {
-								$option = self::setUserVars($user, $option);
-							}
-							self::mount($options['class'], $options['options'], $mountPoint);
-						}
-					}
-				}
-			}
-		}
-		// Load personal mount points
-		if (is_file($root . '/mount.php') or is_file($root . '/mount.json')) {
-			if (is_file($root . '/mount.json')) {
-				$mountConfig = json_decode(file_get_contents($root . '/mount.json'), true);
-			} elseif (is_file($root . '/mount.php')) {
-				$mountConfig = $parser->parsePHP(file_get_contents($root . '/mount.php'));
-			}
-			if (isset($mountConfig['user'][$user])) {
-				foreach ($mountConfig['user'][$user] as $mountPoint => $options) {
-					self::mount($options['class'], $options['options'], $mountPoint);
-				}
-			}
-		}
+		self::mountCacheDir($user);
 
 		// Chance to mount for other storages
 		\OC_Hook::emit('OC_Filesystem', 'post_initMountPoints', array('user' => $user, 'user_dir' => $root));
 	}
 
 	/**
-	 * fill in the correct values for $user
-	 *
-	 * @param string $user
-	 * @param string $input
-	 * @return string
+	 * Mounts the cache directory
+	 * @param string $user user name
 	 */
-	private static function setUserVars($user, $input) {
-		return str_replace('$user', $user, $input);
+	private static function mountCacheDir($user) {
+		$cacheBaseDir = \OC_Config::getValue('cache_path', '');
+		if ($cacheBaseDir === '') {
+			// use local cache dir relative to the user's home
+			$subdir = 'cache';
+			$view = new \OC\Files\View('/' . $user);
+			if(!$view->file_exists($subdir)) {
+				$view->mkdir($subdir);
+			}
+		} else {
+			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user;
+			if (!file_exists($cacheDir)) {
+				mkdir($cacheDir, 0770, true);
+			}
+			// mount external cache dir to "/$user/cache" mount point
+			self::mount('\OC\Files\Storage\Local', array('datadir' => $cacheDir), '/' . $user . '/cache');
+		}
 	}
 
 	/**
@@ -761,7 +716,7 @@ class Filesystem {
 	 *
 	 * @param string $directory path under datadirectory
 	 * @param string $mimetype_filter limit returned content to this mimetype or mimepart
-	 * @return array
+	 * @return \OC\Files\FileInfo[]
 	 */
 	public static function getDirectoryContent($directory, $mimetype_filter = '') {
 		return self::$defaultInstance->getDirectoryContent($directory, $mimetype_filter);
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 9e826dd619..2b69714151 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -27,6 +27,11 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	protected $watcher;
 	protected $storageCache;
 
+	/**
+	 * @var string[]
+	 */
+	protected $cachedFiles = array();
+
 	public function __construct($parameters) {
 	}
 
@@ -122,11 +127,13 @@ abstract class Common implements \OC\Files\Storage\Storage {
 
 	public function file_put_contents($path, $data) {
 		$handle = $this->fopen($path, "w");
+		$this->removeCachedFile($path);
 		return fwrite($handle, $data);
 	}
 
 	public function rename($path1, $path2) {
 		if ($this->copy($path1, $path2)) {
+			$this->removeCachedFile($path1);
 			return $this->unlink($path1);
 		} else {
 			return false;
@@ -137,6 +144,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		$source = $this->fopen($path1, 'r');
 		$target = $this->fopen($path2, 'w');
 		list($count, $result) = \OC_Helper::streamCopy($source, $target);
+		$this->removeCachedFile($path2);
 		return $result;
 	}
 
@@ -152,8 +160,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 
 	public function hash($type, $path, $raw = false) {
 		$tmpFile = $this->getLocalFile($path);
-		$hash = hash($type, $tmpFile, $raw);
-		unlink($tmpFile);
+		$hash = hash_file($type, $tmpFile, $raw);
 		return $hash;
 	}
 
@@ -162,13 +169,14 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	}
 
 	public function getLocalFile($path) {
-		return $this->toTmpFile($path);
+		return $this->getCachedFile($path);
 	}
 
 	/**
 	 * @param string $path
+	 * @return string
 	 */
-	private function toTmpFile($path) { //no longer in the storage api, still useful here
+	protected function toTmpFile($path) { //no longer in the storage api, still useful here
 		$source = $this->fopen($path, 'r');
 		if (!$source) {
 			return false;
@@ -352,4 +360,15 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		// default, which is not local
 		return false;
 	}
+
+	protected function getCachedFile($path) {
+		if (!isset($this->cachedFiles[$path])) {
+			$this->cachedFiles[$path] = $this->toTmpFile($path);
+		}
+		return $this->cachedFiles[$path];
+	}
+
+	protected function removeCachedFile($path) {
+		unset($this->cachedFiles[$path]);
+	}
 }
diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index a62230bdba..571bf7f97c 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -35,7 +35,7 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function mkdir($path) {
-			return @mkdir($this->datadir . $path);
+			return @mkdir($this->datadir . $path, 0777, true);
 		}
 
 		public function rmdir($path) {
@@ -256,7 +256,7 @@ if (\OC_Util::runningOnWindows()) {
 			return 0;
 		}
 
-		public function hash($path, $type, $raw = false) {
+		public function hash($type, $path, $raw = false) {
 			return hash_file($type, $this->datadir . $path, $raw);
 		}
 
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index 1bab3489a2..94ee28ca76 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -31,7 +31,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 		return 'local::'.$this->datadir;
 	}
 	public function mkdir($path) {
-		return @mkdir($this->buildPath($path));
+		return @mkdir($this->buildPath($path), 0777, true);
 	}
 	public function rmdir($path) {
 		try {
@@ -276,7 +276,7 @@ class MappedLocal extends \OC\Files\Storage\Common{
 		return 0;
 	}
 
-	public function hash($path, $type, $raw=false) {
+	public function hash($type, $path, $raw=false) {
 		return hash_file($type, $this->buildPath($path), $raw);
 	}
 
diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php
index 26c952e694..a878b2c5cf 100644
--- a/lib/private/files/storage/wrapper/quota.php
+++ b/lib/private/files/storage/wrapper/quota.php
@@ -29,6 +29,13 @@ class Quota extends Wrapper {
 		$this->sizeRoot = isset($parameters['root']) ? $parameters['root'] : '';
 	}
 
+	/**
+	 * @return quota value
+	 */
+	public function getQuota() {
+		return $this->quota;
+	}
+
 	/**
 	 * @param string $path
 	 */
@@ -36,6 +43,11 @@ class Quota extends Wrapper {
 		$cache = $this->getCache();
 		$data = $cache->get($path);
 		if (is_array($data) and isset($data['size'])) {
+			if (isset($data['unencrypted_size'])
+				&& $data['unencrypted_size'] > 0
+			) {
+				return $data['unencrypted_size'];
+			}
 			return $data['size'];
 		} else {
 			return \OC\Files\SPACE_NOT_COMPUTED;
@@ -57,7 +69,14 @@ class Quota extends Wrapper {
 				return \OC\Files\SPACE_NOT_COMPUTED;
 			} else {
 				$free = $this->storage->free_space($path);
-				return min($free, (max($this->quota - $used, 0)));
+				$quotaFree = max($this->quota - $used, 0);
+				// if free space is known
+				if ($free >= 0) {
+					$free = min($free, $quotaFree);
+				} else {
+					$free = $quotaFree;
+				}
+				return $free;
 			}
 		}
 	}
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 2dbbf5b88c..f06c2fcd66 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -25,6 +25,8 @@
 
 namespace OC\Files;
 
+use OC\Files\Cache\Updater;
+
 class View {
 	private $fakeRoot = '';
 	private $internal_path_cache = array();
@@ -308,6 +310,9 @@ class View {
 					fclose($target);
 					fclose($data);
 					if ($this->shouldEmitHooks($path) && $result !== false) {
+						Updater::writeHook(array(
+							'path' => $this->getHookPath($path)
+						));
 						if (!$exists) {
 							\OC_Hook::emit(
 								Filesystem::CLASSNAME,
@@ -433,6 +438,7 @@ class View {
 				}
 				if ($this->shouldEmitHooks() && (Cache\Scanner::isPartialFile($path1) && !Cache\Scanner::isPartialFile($path2)) && $result !== false) {
 					// if it was a rename from a part file to a regular file it was a write and not a rename operation
+					Updater::writeHook(array('path' => $this->getHookPath($path2)));
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
 						Filesystem::signal_post_write,
@@ -441,6 +447,10 @@ class View {
 						)
 					);
 				} elseif ($this->shouldEmitHooks() && $result !== false) {
+					Updater::renameHook(array(
+						'oldpath' => $this->getHookPath($path1),
+						'newpath' => $this->getHookPath($path2)
+					));
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
 						Filesystem::signal_post_rename,
@@ -741,7 +751,10 @@ class View {
 	}
 
 	/**
+	 * @param string[] $hooks
 	 * @param string $path
+	 * @param bool $post
+	 * @return bool
 	 */
 	private function runHooks($hooks, $path, $post = false) {
 		$path = $this->getHookPath($path);
@@ -749,6 +762,16 @@ class View {
 		$run = true;
 		if ($this->shouldEmitHooks($path)) {
 			foreach ($hooks as $hook) {
+				// manually triger updater hooks to ensure they are called first
+				if ($post) {
+					if ($hook == 'write') {
+						Updater::writeHook(array('path' => $path));
+					} elseif ($hook == 'touch') {
+						Updater::touchHook(array('path' => $path));
+					} else if ($hook == 'delete') {
+						Updater::deleteHook(array('path' => $path));
+					}
+				}
 				if ($hook != 'read') {
 					\OC_Hook::emit(
 						Filesystem::CLASSNAME,
@@ -820,7 +843,7 @@ class View {
 				$data = $cache->get($internalPath);
 			}
 
-			if ($data and $data['fileid']) {
+			if ($data and isset($data['fileid'])) {
 				if ($includeMountPoints and $data['mimetype'] === 'httpd/unix-directory') {
 					//add the sizes of other mountpoints to the folder
 					$mountPoints = Filesystem::getMountPoints($path);
diff --git a/lib/private/forbiddenexception.php b/lib/private/forbiddenexception.php
new file mode 100644
index 0000000000..14a4cd1498
--- /dev/null
+++ b/lib/private/forbiddenexception.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+/**
+ * Exception thrown whenever access to a resource has
+ * been forbidden or whenever a user isn't authenticated.
+ */
+class ForbiddenException extends \Exception {
+}
diff --git a/lib/private/helper.php b/lib/private/helper.php
index d8c4650f66..d7ac0b5f4f 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -78,8 +78,7 @@ class OC_Helper {
 	 * Returns a absolute url to the given app and file.
 	 */
 	public static function linkToAbsolute($app, $file, $args = array()) {
-		$urlLinkTo = self::linkTo($app, $file, $args);
-		return self::makeURLAbsolute($urlLinkTo);
+		return self::linkTo($app, $file, $args);
 	}
 
 	/**
@@ -308,7 +307,7 @@ class OC_Helper {
 
 	/**
 	 * @brief Make a computer file size
-	 * @param string $str file size in a fancy format
+	 * @param string $str file size in human readable format
 	 * @return int a file size in bytes
 	 *
 	 * Makes 2kB to 2048.
@@ -338,40 +337,11 @@ class OC_Helper {
 			$bytes *= $bytes_array[$matches[1]];
 		}
 
-		$bytes = round($bytes, 2);
+		$bytes = round($bytes);
 
 		return $bytes;
 	}
 
-	/**
-	 * @brief Recursive editing of file permissions
-	 * @param string $path path to file or folder
-	 * @param int $filemode unix style file permissions
-	 * @return bool
-	 */
-	static function chmodr($path, $filemode) {
-		if (!is_dir($path))
-			return chmod($path, $filemode);
-		$dh = opendir($path);
-		if(is_resource($dh)) {
-			while (($file = readdir($dh)) !== false) {
-				if ($file != '.' && $file != '..') {
-					$fullpath = $path . '/' . $file;
-					if (is_link($fullpath))
-						return false;
-					elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode))
-						return false; elseif (!self::chmodr($fullpath, $filemode))
-						return false;
-				}
-			}
-			closedir($dh);
-		}
-		if (@chmod($path, $filemode))
-			return true;
-		else
-			return false;
-	}
-
 	/**
 	 * @brief Recursive copying of folders
 	 * @param string $src source folder
@@ -839,7 +809,7 @@ class OC_Helper {
 	 * @return int number of bytes representing
 	 */
 	public static function maxUploadFilesize($dir, $freeSpace = null) {
-		if (is_null($freeSpace)){
+		if (is_null($freeSpace) || $freeSpace < 0){
 			$freeSpace = self::freeSpace($dir);
 		}
 		return min($freeSpace, self::uploadLimit());
@@ -914,13 +884,22 @@ class OC_Helper {
 		if ($used < 0) {
 			$used = 0;
 		}
-		$free = \OC\Files\Filesystem::free_space($path);
+		$quota = 0;
+		// TODO: need a better way to get total space from storage
+		$storage = $rootInfo->getStorage();
+		if ($storage instanceof \OC\Files\Storage\Wrapper\Quota) {
+			$quota = $storage->getQuota();
+		}
+		$free = $storage->free_space('');
 		if ($free >= 0) {
 			$total = $free + $used;
 		} else {
 			$total = $free; //either unknown or unlimited
 		}
 		if ($total > 0) {
+			if ($quota > 0 && $total > $quota) {
+				$total = $quota;
+			}
 			// prevent division by zero or error codes (negative values)
 			$relative = round(($used / $total) * 10000) / 100;
 		} else {
diff --git a/lib/private/image.php b/lib/private/image.php
index e0397ec8a0..f1b8acc41b 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -35,24 +35,24 @@ class OC_Image {
 	/**
 	* @brief Get mime type for an image file.
 	* @param string|null $filePath The path to a local image file.
-	* @returns string The mime type if the it could be determined, otherwise an empty string.
+	* @return string The mime type if the it could be determined, otherwise an empty string.
 	*/
 	static public function getMimeTypeForFile($filePath) {
 		// exif_imagetype throws "read error!" if file is less than 12 byte
 		if (filesize($filePath) > 11) {
 			$imageType = exif_imagetype($filePath);
-		}
-		else {
+		} else {
 			$imageType = false;
 		}
 		return $imageType ? image_type_to_mime_type($imageType) : '';
 	}
 
 	/**
-	* @brief Constructor.
-	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function.
-	* @returns bool False on error
-	*/
+	 * @brief Constructor.
+	 * @param resource|string $imageref The path to a local file, a base64 encoded string or a resource created by
+	 * an imagecreate* function.
+	 * @return \OC_Image False on error
+	 */
 	public function __construct($imageRef = null) {
 		//OC_Log::write('core',__METHOD__.'(): start', OC_Log::DEBUG);
 		if(!extension_loaded('gd') || !function_exists('gd_info')) {
@@ -71,7 +71,7 @@ class OC_Image {
 
 	/**
 	* @brief Determine whether the object contains an image resource.
-	* @returns bool
+	* @return bool
 	*/
 	public function valid() { // apparently you can't name a method 'empty'...
 		return is_resource($this->resource);
@@ -79,7 +79,7 @@ class OC_Image {
 
 	/**
 	* @brief Returns the MIME type of the image or an empty string if no image is loaded.
-	* @returns int
+	* @return int
 	*/
 	public function mimeType() {
 		return $this->valid() ? $this->mimeType : '';
@@ -87,7 +87,7 @@ class OC_Image {
 
 	/**
 	* @brief Returns the width of the image or -1 if no image is loaded.
-	* @returns int
+	* @return int
 	*/
 	public function width() {
 		return $this->valid() ? imagesx($this->resource) : -1;
@@ -95,7 +95,7 @@ class OC_Image {
 
 	/**
 	* @brief Returns the height of the image or -1 if no image is loaded.
-	* @returns int
+	* @return int
 	*/
 	public function height() {
 		return $this->valid() ? imagesy($this->resource) : -1;
@@ -103,7 +103,7 @@ class OC_Image {
 
 	/**
 	* @brief Returns the width when the image orientation is top-left.
-	* @returns int
+	* @return int
 	*/
 	public function widthTopLeft() {
 		$o = $this->getOrientation();
@@ -115,20 +115,18 @@ class OC_Image {
 			case 3:
 			case 4: // Not tested
 				return $this->width();
-				break;
 			case 5: // Not tested
 			case 6:
 			case 7: // Not tested
 			case 8:
 				return $this->height();
-				break;
 		}
 		return $this->width();
 	}
 
 	/**
 	* @brief Returns the height when the image orientation is top-left.
-	* @returns int
+	* @return int
 	*/
 	public function heightTopLeft() {
 		$o = $this->getOrientation();
@@ -140,46 +138,56 @@ class OC_Image {
 			case 3:
 			case 4: // Not tested
 				return $this->height();
-				break;
 			case 5: // Not tested
 			case 6:
 			case 7: // Not tested
 			case 8:
 				return $this->width();
-				break;
 		}
 		return $this->height();
 	}
 
 	/**
-	* @brief Outputs the image.
-	* @returns bool
-	*/
-	public function show() {
-		header('Content-Type: '.$this->mimeType());
-		return $this->_output();
+	 * @brief Outputs the image.
+	 * @param string $mimeType
+	 * @return bool
+	 */
+	public function show($mimeType=null) {
+		if($mimeType === null) {
+			$mimeType = $this->mimeType();
+		}
+		header('Content-Type: '.$mimeType);
+		return $this->_output(null, $mimeType);
 	}
 
 	/**
-	* @brief Saves the image.
-	* @returns bool
-	* @param string $filePath
-	*/
+	 * @brief Saves the image.
+	 * @param string $filePath
+	 * @param string $mimeType
+	 * @return bool
+	 */
 
-	public function save($filePath=null) {
+	public function save($filePath=null, $mimeType=null) {
+		if($mimeType === null) {
+			$mimeType = $this->mimeType();
+		}
 		if($filePath === null && $this->filePath === null) {
 			OC_Log::write('core', __METHOD__.'(): called with no path.', OC_Log::ERROR);
 			return false;
 		} elseif($filePath === null && $this->filePath !== null) {
 			$filePath = $this->filePath;
 		}
-		return $this->_output($filePath);
+		return $this->_output($filePath, $mimeType);
 	}
 
 	/**
-	* @brief Outputs/saves the image.
-	*/
-	private function _output($filePath=null) {
+	 * @brief Outputs/saves the image.
+	 * @param string $filePath
+	 * @param string $mimeType
+	 * @return bool
+	 * @throws Exception
+	 */
+	private function _output($filePath=null, $mimeType=null) {
 		if($filePath) {
 			if (!file_exists(dirname($filePath)))
 				mkdir(dirname($filePath), 0777, true);
@@ -197,8 +205,30 @@ class OC_Image {
 			return false;
 		}
 
-		$retVal = false;
-		switch($this->imageType) {
+		$imageType = $this->imageType;
+		if($mimeType !== null) {
+			switch($mimeType) {
+				case 'image/gif':
+					$imageType = IMAGETYPE_GIF;
+					break;
+				case 'image/jpeg':
+					$imageType = IMAGETYPE_JPEG;
+					break;
+				case 'image/png':
+					$imageType = IMAGETYPE_PNG;
+					break;
+				case 'image/x-xbitmap':
+					$imageType = IMAGETYPE_XBM;
+					break;
+				case 'image/bmp':
+					$imageType = IMAGETYPE_BMP;
+					break;
+				default:
+					throw new Exception('\OC_Image::_output(): "' . $mimeType . '" is not supported when forcing a specific output format');
+			}
+		}
+
+		switch($imageType) {
 			case IMAGETYPE_GIF:
 				$retVal = imagegif($this->resource, $filePath);
 				break;
@@ -209,7 +239,12 @@ class OC_Image {
 				$retVal = imagepng($this->resource, $filePath);
 				break;
 			case IMAGETYPE_XBM:
-				$retVal = imagexbm($this->resource, $filePath);
+				if (function_exists('imagexbm')) {
+					$retVal = imagexbm($this->resource, $filePath);
+				} else {
+					throw new Exception('\OC_Image::_output(): imagexbm() is not supported.');
+				}
+
 				break;
 			case IMAGETYPE_WBMP:
 				$retVal = imagewbmp($this->resource, $filePath);
@@ -231,14 +266,14 @@ class OC_Image {
 	}
 
 	/**
-	* @returns resource Returns the image resource in any.
+	* @return resource Returns the image resource in any.
 	*/
 	public function resource() {
 		return $this->resource;
 	}
 
 	/**
-	* @returns Returns the raw image data.
+	* @return string Returns the raw image data.
 	*/
 	function data() {
 		ob_start();
@@ -264,8 +299,8 @@ class OC_Image {
 	}
 
 	/**
-	* @returns Returns a base64 encoded string suitable for embedding in a VCard.
-	*/
+	 * @return string - base64 encoded, which is suitable for embedding in a VCard.
+	 */
 	function __toString() {
 		return base64_encode($this->data());
 	}
@@ -273,7 +308,7 @@ class OC_Image {
 	/**
 	* (I'm open for suggestions on better method name ;)
 	* @brief Get the orientation based on EXIF data.
-	* @returns The orientation or -1 if no EXIF data is available.
+	* @return int The orientation or -1 if no EXIF data is available.
 	*/
 	public function getOrientation() {
 		if(!is_callable('exif_read_data')) {
@@ -301,53 +336,43 @@ class OC_Image {
 	/**
 	* (I'm open for suggestions on better method name ;)
 	* @brief Fixes orientation based on EXIF data.
-	* @returns bool.
+	* @return bool.
 	*/
 	public function fixOrientation() {
 		$o = $this->getOrientation();
 		OC_Log::write('core', 'OC_Image->fixOrientation() Orientation: '.$o, OC_Log::DEBUG);
 		$rotate = 0;
-		$flip = false;
 		switch($o) {
 			case -1:
 				return false; //Nothing to fix
-				break;
 			case 1:
 				$rotate = 0;
-				$flip = false;
 				break;
 			case 2: // Not tested
 				$rotate = 0;
-				$flip = true;
 				break;
 			case 3:
 				$rotate = 180;
-				$flip = false;
 				break;
 			case 4: // Not tested
 				$rotate = 180;
-				$flip = true;
 				break;
 			case 5: // Not tested
 				$rotate = 90;
-				$flip = true;
 				break;
 			case 6:
 				//$rotate = 90;
 				$rotate = 270;
-				$flip = false;
 				break;
 			case 7: // Not tested
 				$rotate = 270;
-				$flip = true;
 				break;
 			case 8:
 				$rotate = 90;
-				$flip = false;
 				break;
 		}
 		if($rotate) {
-			$res = imagerotate($this->resource, $rotate, -1);
+			$res = imagerotate($this->resource, $rotate, 0);
 			if($res) {
 				if(imagealphablending($res, true)) {
 					if(imagesavealpha($res, true)) {
@@ -367,13 +392,14 @@ class OC_Image {
 				return false;
 			}
 		}
+		return false;
 	}
 
 	/**
-	* @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
-	* @param $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function or a file resource (file handle	).
-	* @returns An image resource or false on error
-	*/
+	 * @brief Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	 * @param resource|string $imageref The path to a local file, a base64 encoded string or a resource created by an imagecreate* function or a file resource (file handle    ).
+	 * @return resource|false An image resource or false on error
+	 */
 	public function load($imageRef) {
 		if(is_resource($imageRef)) {
 			if(get_resource_type($imageRef) == 'gd') {
@@ -382,10 +408,10 @@ class OC_Image {
 			} elseif(in_array(get_resource_type($imageRef), array('file', 'stream'))) {
 				return $this->loadFromFileHandle($imageRef);
 			}
-		} elseif($this->loadFromFile($imageRef) !== false) {
-			return $this->resource;
 		} elseif($this->loadFromBase64($imageRef) !== false) {
 			return $this->resource;
+		} elseif($this->loadFromFile($imageRef) !== false) {
+			return $this->resource;
 		} elseif($this->loadFromData($imageRef) !== false) {
 			return $this->resource;
 		} else {
@@ -398,7 +424,7 @@ class OC_Image {
 	* @brief Loads an image from an open file handle.
 	* It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
 	* @param resource $handle
-	* @returns An image resource or false on error
+	* @return An image resource or false on error
 	*/
 	public function loadFromFileHandle($handle) {
 		OC_Log::write('core', __METHOD__.'(): Trying', OC_Log::DEBUG);
@@ -410,13 +436,12 @@ class OC_Image {
 
 	/**
 	* @brief Loads an image from a local file.
-	* @param $imagePath The path to a local file.
-	* @returns An image resource or false on error
+	* @param bool|string $imagePath The path to a local file.
+	* @return bool|resource An image resource or false on error
 	*/
 	public function loadFromFile($imagePath=false) {
 		// exif_imagetype throws "read error!" if file is less than 12 byte
 		if(!@is_file($imagePath) || !file_exists($imagePath) || filesize($imagePath) < 12 || !is_readable($imagePath)) {
-			// Debug output disabled because this method is tried before loadFromBase64?
 			OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: ' . (string) urlencode($imagePath), OC_Log::DEBUG);
 			return false;
 		}
@@ -512,8 +537,8 @@ class OC_Image {
 
 	/**
 	* @brief Loads an image from a string of data.
-	* @param $str A string of image data as read from a file.
-	* @returns An image resource or false on error
+	* @param string $str A string of image data as read from a file.
+	* @return bool|resource An image resource or false on error
 	*/
 	public function loadFromData($str) {
 		if(is_resource($str)) {
@@ -537,8 +562,8 @@ class OC_Image {
 
 	/**
 	* @brief Loads an image from a base64 encoded string.
-	* @param $str A string base64 encoded string of image data.
-	* @returns An image resource or false on error
+	* @param string $str A string base64 encoded string of image data.
+	* @return bool|resource An image resource or false on error
 	*/
 	public function loadFromBase64($str) {
 		if(!is_string($str)) {
@@ -567,7 +592,7 @@ class OC_Image {
 	 * @param string $fileName <p>
 	 * Path to the BMP image.
 	 * </p>
-	 * @return resource an image resource identifier on success, <b>FALSE</b> on errors.
+	 * @return bool|resource an image resource identifier on success, <b>FALSE</b> on errors.
 	 */
 	private function imagecreatefrombmp($fileName) {
 		if (!($fh = fopen($fileName, 'rb'))) {
@@ -599,9 +624,9 @@ class OC_Image {
 			$meta['imagesize'] = $meta['filesize'] - $meta['offset'];
 			// in rare cases filesize is equal to offset so we need to read physical size
 			if ($meta['imagesize'] < 1) {
-				$meta['imagesize'] = @filesize($filename) - $meta['offset'];
+				$meta['imagesize'] = @filesize($fileName) - $meta['offset'];
 				if ($meta['imagesize'] < 1) {
-					trigger_error('imagecreatefrombmp: Can not obtain filesize of ' . $filename . '!', E_USER_WARNING);
+					trigger_error('imagecreatefrombmp: Can not obtain filesize of ' . $fileName . '!', E_USER_WARNING);
 					return false;
 				}
 			}
@@ -706,7 +731,7 @@ class OC_Image {
 	/**
 	* @brief Resizes the image preserving ratio.
 	* @param integer $maxSize The maximum size of either the width or height.
-	* @returns bool
+	* @return bool
 	*/
 	public function resize($maxSize) {
 		if(!$this->valid()) {
@@ -729,6 +754,11 @@ class OC_Image {
 		return true;
 	}
 
+	/**
+	 * @param int $width
+	 * @param int $height
+	 * @return bool
+	 */
 	public function preciseResize($width, $height) {
 		if (!$this->valid()) {
 			OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR);
@@ -764,8 +794,8 @@ class OC_Image {
 
 	/**
 	* @brief Crops the image to the middle square. If the image is already square it just returns.
-	* @param int maximum size for the result (optional)
-	* @returns bool for success or failure
+	* @param int $size maximum size for the result (optional)
+	* @return bool for success or failure
 	*/
 	public function centerCrop($size=0) {
 		if(!$this->valid()) {
@@ -823,11 +853,11 @@ class OC_Image {
 
 	/**
 	* @brief Crops the image from point $x$y with dimension $wx$h.
-	* @param $x Horizontal position
-	* @param $y Vertical position
-	* @param $w Width
-	* @param $h Height
-	* @returns bool for success or failure
+	* @param int $x Horizontal position
+	* @param int $y Vertical position
+	* @param int $w Width
+	* @param int $h Height
+	* @return bool for success or failure
 	*/
 	public function crop($x, $y, $w, $h) {
 		if(!$this->valid()) {
@@ -855,7 +885,7 @@ class OC_Image {
 	 * @brief Resizes the image to fit within a boundry while preserving ratio.
 	 * @param integer $maxWidth
 	 * @param integer $maxHeight
-	 * @returns bool
+	 * @return bool
 	 */
 	public function fitIn($maxWidth, $maxHeight) {
 		if(!$this->valid()) {
@@ -947,7 +977,7 @@ if ( ! function_exists( 'imagebmp') ) {
 						$index = imagecolorat($im, $i, $j);
 						if ($index !== $lastIndex || $sameNum > 255) {
 							if ($sameNum != 0) {
-								$bmpData .= chr($same_num) . chr($lastIndex);
+								$bmpData .= chr($sameNum) . chr($lastIndex);
 							}
 							$lastIndex = $index;
 							$sameNum = 1;
diff --git a/lib/private/installer.php b/lib/private/installer.php
index 11633a4d4a..64e8e3a5e7 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -464,7 +464,7 @@ class OC_Installer{
 		// is the code checker enabled?
 		if(OC_Config::getValue('appcodechecker', true)) {
 			// check if grep is installed
-			$grep = exec('which grep');
+			$grep = exec('command -v grep');
 			if($grep=='') {
 				OC_Log::write('core',
 					'grep not installed. So checking the code of the app "'.$appname.'" was not possible',
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index f0b4f9a70f..175360e27a 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -405,7 +405,7 @@ class OC_L10N implements \OCP\IL10N {
 
 	/**
 	 * @brief Choose a language
-	 * @param array $texts Associative Array with possible strings
+	 * @param array $text Associative Array with possible strings
 	 * @returns String
 	 *
 	 * $text is an array 'de' => 'hallo welt', 'en' => 'hello world', ...
@@ -413,14 +413,14 @@ class OC_L10N implements \OCP\IL10N {
 	 * This function is useful to avoid loading thousands of files if only one
 	 * simple string is needed, for example in appinfo.php
 	 */
-	public static function selectLanguage($texts) {
-		$lang = self::findLanguage(array_keys($texts));
-		return $texts[$lang];
+	public static function selectLanguage($text) {
+		$lang = self::findLanguage(array_keys($text));
+		return $text[$lang];
 	}
 
 	/**
 	 * @brief find the best language
-	 * @param array|string $app Array or string, details below
+	 * @param array|string $app details below
 	 * @returns string language
 	 *
 	 * If $app is an array, ownCloud assumes that these are the available
@@ -532,8 +532,9 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @param string $lang
 	 * @param string $app
+	 * @param string $lang
+	 * @returns bool
 	 */
 	public static function languageExists($app, $lang) {
 		if ($lang == 'en') {//english is always available
diff --git a/lib/private/mail.php b/lib/private/mail.php
index 90c3e34319..79f5160963 100644
--- a/lib/private/mail.php
+++ b/lib/private/mail.php
@@ -72,11 +72,9 @@ class OC_Mail {
 		$mailo->From = $fromaddress;
 		$mailo->FromName = $fromname;;
 		$mailo->Sender = $fromaddress;
-		$a=explode(' ', $toaddress);
 		try {
-			foreach($a as $ad) {
-				$mailo->AddAddress($ad, $toname);
-			}
+			$toaddress = self::buildAsciiEmail($toaddress);
+			$mailo->AddAddress($toaddress, $toname);
 
 			if($ccaddress<>'') $mailo->AddCC($ccaddress, $ccname);
 			if($bcc<>'') $mailo->AddBCC($bcc);
@@ -127,7 +125,23 @@ class OC_Mail {
 	 * @param string $emailAddress a given email address to be validated
 	 * @return bool
 	 */
-	public static function ValidateAddress($emailAddress) {
+	public static function validateAddress($emailAddress) {
+		$emailAddress = self::buildAsciiEmail($emailAddress);
 		return PHPMailer::ValidateAddress($emailAddress);
 	}
+
+	/**
+	 * IDN domains will be properly converted to ascii domains.
+	 *
+	 * @param string $emailAddress
+	 * @return string
+	 */
+	public static function buildAsciiEmail($emailAddress) {
+
+		list($name, $domain) = explode('@', $emailAddress, 2);
+		$domain = idn_to_ascii($domain);
+
+		return "$name@$domain";
+	}
+
 }
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php
index 9bd07b8902..91bcf58426 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -31,6 +31,7 @@ return array(
 	'bash' => 'text/x-shellscript',
 	'blend' => 'application/x-blender',
 	'bin' => 'application/x-bin',
+	'bmp' => 'image/bmp',
 	'cb7' => 'application/x-cbr',
 	'cba' => 'application/x-cbr',
 	'cbr' => 'application/x-cbr',
@@ -76,6 +77,7 @@ return array(
 	'md' => 'text/markdown',
 	'mdb' => 'application/msaccess',
 	'mdwn' => 'text/markdown',
+	'mkv' => 'video/x-matroska',
 	'mobi' => 'application/x-mobipocket-ebook',
 	'mov' => 'video/quicktime',
 	'mp3' => 'audio/mpeg',
diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php
index cbbf3b626f..06d6a8eb4b 100644
--- a/lib/private/ocs/cloud.php
+++ b/lib/private/ocs/cloud.php
@@ -61,17 +61,29 @@ class OC_OCS_Cloud {
 	 *                           the user from whom the information will be returned
 	 */
 	public static function getUser($parameters) {
+		$return  = array();
 		// Check if they are viewing information on themselves
 		if($parameters['userid'] === OC_User::getUser()) {
 			// Self lookup
 			$storage = OC_Helper::getStorageInfo('/');
-			$quota = array(
+			$return['quota'] = array(
 				'free' =>  $storage['free'],
 				'used' =>  $storage['used'],
 				'total' =>  $storage['total'],
 				'relative' => $storage['relative'],
 				);
-			return new OC_OCS_Result(array('quota' => $quota));
+		}
+		if(OC_User::isAdminUser(OC_User::getUser()) 
+			|| OC_Subadmin::isUserAccessible(OC_User::getUser(), $parameters['userid'])) {
+			if(OC_User::userExists($parameters['userid'])) {
+				// Is an admin/subadmin so can see display name
+				$return['displayname'] = OC_User::getDisplayName($parameters['userid']);
+			} else {
+				return new OC_OCS_Result(null, 101);
+			}
+		}
+		if(count($return)) {
+			return new OC_OCS_Result($return);
 		} else {
 			// No permission to view this user data
 			return new OC_OCS_Result(null, 997);
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index fa6e3fac1b..68dc2c2d6e 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -72,7 +72,9 @@ class OC_OCSClient{
 		if($xml==false) {
 			return null;
 		}
-		$data=simplexml_load_string($xml);
+		$loadEntities = libxml_disable_entity_loader(true);
+		$data =	simplexml_load_string($xml);
+		libxml_disable_entity_loader($loadEntities);
 
 		$tmp=$data->data;
 		$cats=array();
@@ -117,7 +119,9 @@ class OC_OCSClient{
 		if($xml==false) {
 			return null;
 		}
-		$data=simplexml_load_string($xml);
+		$loadEntities = libxml_disable_entity_loader(true);
+		$data = simplexml_load_string($xml);
+		libxml_disable_entity_loader($loadEntities);
 
 		$tmp=$data->data->content;
 		for($i = 0; $i < count($tmp); $i++) {
@@ -159,7 +163,9 @@ class OC_OCSClient{
 			OC_Log::write('core', 'Unable to parse OCS content', OC_Log::FATAL);
 			return null;
 		}
-		$data=simplexml_load_string($xml);
+		$loadEntities = libxml_disable_entity_loader(true);
+		$data = simplexml_load_string($xml);
+		libxml_disable_entity_loader($loadEntities);
 
 		$tmp=$data->data->content;
 		$app=array();
@@ -200,7 +206,9 @@ class OC_OCSClient{
 			OC_Log::write('core', 'Unable to parse OCS content', OC_Log::FATAL);
 			return null;
 		}
-		$data=simplexml_load_string($xml);
+		$loadEntities = libxml_disable_entity_loader(true);
+		$data = simplexml_load_string($xml);
+		libxml_disable_entity_loader($loadEntities);
 
 		$tmp=$data->data->content;
 		$app=array();
diff --git a/lib/private/preview.php b/lib/private/preview.php
index 80fd003ed8..0c1af3c958 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -42,6 +42,10 @@ class Preview {
 	private $scalingup;
 	private $mimetype;
 
+	//filemapper used for deleting previews
+	// index is path, value is fileinfo
+	static public $deleteFileMapper = array();
+
 	//preview images object
 	/**
 	 * @var \OC_Image
@@ -52,6 +56,11 @@ class Preview {
 	static private $providers = array();
 	static private $registeredProviders = array();
 
+	/**
+	 * @var \OCP\Files\FileInfo
+	 */
+	protected $info;
+
 	/**
 	 * @brief check if thumbnail or bigger version of thumbnail of file is cached
 	 * @param string $user userid - if no user is given, OC_User::getUser will be used
@@ -61,12 +70,12 @@ class Preview {
 	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
 	 * @param bool $scalingUp Disable/Enable upscaling of previews
 	 * @return mixed (bool / string)
-	 *					false if thumbnail does not exist
-	 *					path to thumbnail if thumbnail exists
-	*/
-	public function __construct($user='', $root='/', $file='', $maxX=1, $maxY=1, $scalingUp=true) {
+	 *                    false if thumbnail does not exist
+	 *                    path to thumbnail if thumbnail exists
+	 */
+	public function __construct($user = '', $root = '/', $file = '', $maxX = 1, $maxY = 1, $scalingUp = true) {
 		//init fileviews
-		if($user === ''){
+		if ($user === '') {
 			$user = \OC_User::getUser();
 		}
 		$this->fileView = new \OC\Files\View('/' . $user . '/' . $root);
@@ -86,11 +95,11 @@ class Preview {
 		$this->preview = null;
 
 		//check if there are preview backends
-		if(empty(self::$providers)) {
+		if (empty(self::$providers)) {
 			self::initProviders();
 		}
 
-		if(empty(self::$providers)) {
+		if (empty(self::$providers)) {
 			\OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR);
 			throw new \Exception('No preview providers');
 		}
@@ -99,15 +108,15 @@ class Preview {
 	/**
 	 * @brief returns the path of the file you want a thumbnail from
 	 * @return string
-	*/
-	public function	getFile() {
+	 */
+	public function    getFile() {
 		return $this->file;
 	}
 
 	/**
 	 * @brief returns the max width of the preview
 	 * @return integer
-	*/
+	 */
 	public function getMaxX() {
 		return $this->maxX;
 	}
@@ -115,7 +124,7 @@ class Preview {
 	/**
 	 * @brief returns the max height of the preview
 	 * @return integer
-	*/
+	 */
 	public function getMaxY() {
 		return $this->maxY;
 	}
@@ -123,7 +132,7 @@ class Preview {
 	/**
 	 * @brief returns whether or not scalingup is enabled
 	 * @return bool
-	*/
+	 */
 	public function getScalingUp() {
 		return $this->scalingup;
 	}
@@ -131,7 +140,7 @@ class Preview {
 	/**
 	 * @brief returns the name of the thumbnailfolder
 	 * @return string
-	*/
+	 */
 	public function getThumbnailsFolder() {
 		return self::THUMBNAILS_FOLDER;
 	}
@@ -139,7 +148,7 @@ class Preview {
 	/**
 	 * @brief returns the max scale factor
 	 * @return string
-	*/
+	 */
 	public function getMaxScaleFactor() {
 		return $this->maxScaleFactor;
 	}
@@ -147,7 +156,7 @@ class Preview {
 	/**
 	 * @brief returns the max width set in ownCloud's config
 	 * @return string
-	*/
+	 */
 	public function getConfigMaxX() {
 		return $this->configMaxX;
 	}
@@ -155,20 +164,35 @@ class Preview {
 	/**
 	 * @brief returns the max height set in ownCloud's config
 	 * @return string
-	*/
+	 */
 	public function getConfigMaxY() {
 		return $this->configMaxY;
 	}
 
+	protected function getFileInfo() {
+		$absPath = $this->fileView->getAbsolutePath($this->file);
+		$absPath = Files\Filesystem::normalizePath($absPath);
+		if(array_key_exists($absPath, self::$deleteFileMapper)) {
+			$this->info = self::$deleteFileMapper[$absPath];
+		} else if (!$this->info) {
+			$this->info = $this->fileView->getFileInfo($this->file);
+		}
+		return $this->info;
+	}
+
 	/**
 	 * @brief set the path of the file you want a thumbnail from
 	 * @param string $file
 	 * @return $this
-	*/
+	 */
 	public function setFile($file) {
 		$this->file = $file;
+		$this->info = null;
 		if ($file !== '') {
-			$this->mimetype = $this->fileView->getMimeType($this->file);
+			$this->getFileInfo();
+			if($this->info !== null && $this->info !== false) {
+				$this->mimetype = $this->info->getMimetype();
+			}
 		}
 		return $this;
 	}
@@ -185,14 +209,14 @@ class Preview {
 	 * @brief set the the max width of the preview
 	 * @param int $maxX
 	 * @return $this
-	*/
-	public function setMaxX($maxX=1) {
-		if($maxX <= 0) {
+	 */
+	public function setMaxX($maxX = 1) {
+		if ($maxX <= 0) {
 			throw new \Exception('Cannot set width of 0 or smaller!');
 		}
 		$configMaxX = $this->getConfigMaxX();
-		if(!is_null($configMaxX)) {
-			if($maxX > $configMaxX) {
+		if (!is_null($configMaxX)) {
+			if ($maxX > $configMaxX) {
 				\OC_Log::write('core', 'maxX reduced from ' . $maxX . ' to ' . $configMaxX, \OC_Log::DEBUG);
 				$maxX = $configMaxX;
 			}
@@ -205,14 +229,14 @@ class Preview {
 	 * @brief set the the max height of the preview
 	 * @param int $maxY
 	 * @return $this
-	*/
-	public function setMaxY($maxY=1) {
-		if($maxY <= 0) {
+	 */
+	public function setMaxY($maxY = 1) {
+		if ($maxY <= 0) {
 			throw new \Exception('Cannot set height of 0 or smaller!');
 		}
 		$configMaxY = $this->getConfigMaxY();
-		if(!is_null($configMaxY)) {
-			if($maxY > $configMaxY) {
+		if (!is_null($configMaxY)) {
+			if ($maxY > $configMaxY) {
 				\OC_Log::write('core', 'maxX reduced from ' . $maxY . ' to ' . $configMaxY, \OC_Log::DEBUG);
 				$maxY = $configMaxY;
 			}
@@ -225,9 +249,9 @@ class Preview {
 	 * @brief set whether or not scalingup is enabled
 	 * @param bool $scalingUp
 	 * @return $this
-	*/
+	 */
 	public function setScalingup($scalingUp) {
-		if($this->getMaxScaleFactor() === 1) {
+		if ($this->getMaxScaleFactor() === 1) {
 			$scalingUp = false;
 		}
 		$this->scalingup = $scalingUp;
@@ -237,15 +261,15 @@ class Preview {
 	/**
 	 * @brief check if all parameters are valid
 	 * @return bool
-	*/
+	 */
 	public function isFileValid() {
 		$file = $this->getFile();
-		if($file === '') {
+		if ($file === '') {
 			\OC_Log::write('core', 'No filename passed', \OC_Log::DEBUG);
 			return false;
 		}
 
-		if(!$this->fileView->file_exists($file)) {
+		if (!$this->fileView->file_exists($file)) {
 			\OC_Log::write('core', 'File:"' . $file . '" not found', \OC_Log::DEBUG);
 			return false;
 		}
@@ -256,40 +280,44 @@ class Preview {
 	/**
 	 * @brief deletes previews of a file with specific x and y
 	 * @return bool
-	*/
+	 */
 	public function deletePreview() {
 		$file = $this->getFile();
 
-		$fileInfo = $this->fileView->getFileInfo($file);
-		$fileId = $fileInfo['fileid'];
+		$fileInfo = $this->getFileInfo($file);
+		if($fileInfo !== null && $fileInfo !== false) {
+			$fileId = $fileInfo->getId();
 
-		$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png';
-		$this->userView->unlink($previewPath);
-		return !$this->userView->file_exists($previewPath);
+			$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/' . $this->getMaxX() . '-' . $this->getMaxY() . '.png';
+			return $this->userView->unlink($previewPath);
+		}
+		return false;
 	}
 
 	/**
 	 * @brief deletes all previews of a file
 	 * @return bool
-	*/
+	 */
 	public function deleteAllPreviews() {
 		$file = $this->getFile();
 
-		$fileInfo = $this->fileView->getFileInfo($file);
-		$fileId = $fileInfo['fileid'];
+		$fileInfo = $this->getFileInfo($file);
+		if($fileInfo !== null && $fileInfo !== false) {
+			$fileId = $fileInfo->getId();
 
-		$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
-		$this->userView->deleteAll($previewPath);
-		$this->userView->rmdir($previewPath);
-		return !$this->userView->is_dir($previewPath);
+			$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
+			$this->userView->deleteAll($previewPath);
+			return $this->userView->rmdir($previewPath);
+		}
+		return false;
 	}
 
 	/**
 	 * @brief check if thumbnail or bigger version of thumbnail of file is cached
 	 * @return mixed (bool / string)
-	 *				false if thumbnail does not exist
-	 *				path to thumbnail if thumbnail exists
-	*/
+	 *                false if thumbnail does not exist
+	 *                path to thumbnail if thumbnail exists
+	 */
 	private function isCached() {
 		$file = $this->getFile();
 		$maxX = $this->getMaxX();
@@ -297,75 +325,75 @@ class Preview {
 		$scalingUp = $this->getScalingUp();
 		$maxScaleFactor = $this->getMaxScaleFactor();
 
-		$fileInfo = $this->fileView->getFileInfo($file);
-		$fileId = $fileInfo['fileid'];
+		$fileInfo = $this->getFileInfo($file);
+		$fileId = $fileInfo->getId();
 
-		if(is_null($fileId)) {
+		if (is_null($fileId)) {
 			return false;
 		}
 
 		$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
-		if(!$this->userView->is_dir($previewPath)) {
+		if (!$this->userView->is_dir($previewPath)) {
 			return false;
 		}
 
 		//does a preview with the wanted height and width already exist?
-		if($this->userView->file_exists($previewPath . $maxX . '-' . $maxY . '.png')) {
+		if ($this->userView->file_exists($previewPath . $maxX . '-' . $maxY . '.png')) {
 			return $previewPath . $maxX . '-' . $maxY . '.png';
 		}
 
-		$wantedAspectRatio = (float) ($maxX / $maxY);
+		$wantedAspectRatio = (float)($maxX / $maxY);
 
 		//array for usable cached thumbnails
 		$possibleThumbnails = array();
 
 		$allThumbnails = $this->userView->getDirectoryContent($previewPath);
-		foreach($allThumbnails as $thumbnail) {
+		foreach ($allThumbnails as $thumbnail) {
 			$name = rtrim($thumbnail['name'], '.png');
 			$size = explode('-', $name);
-			$x = (int) $size[0];
-			$y = (int) $size[1];
+			$x = (int)$size[0];
+			$y = (int)$size[1];
 
-			$aspectRatio = (float) ($x / $y);
-			if($aspectRatio !== $wantedAspectRatio) {
+			$aspectRatio = (float)($x / $y);
+			if ($aspectRatio !== $wantedAspectRatio) {
 				continue;
 			}
 
-			if($x < $maxX || $y < $maxY) {
-				if($scalingUp) {
+			if ($x < $maxX || $y < $maxY) {
+				if ($scalingUp) {
 					$scalefactor = $maxX / $x;
-					if($scalefactor > $maxScaleFactor) {
+					if ($scalefactor > $maxScaleFactor) {
 						continue;
 					}
-				}else{
+				} else {
 					continue;
 				}
 			}
 			$possibleThumbnails[$x] = $thumbnail['path'];
 		}
 
-		if(count($possibleThumbnails) === 0) {
+		if (count($possibleThumbnails) === 0) {
 			return false;
 		}
 
-		if(count($possibleThumbnails) === 1) {
+		if (count($possibleThumbnails) === 1) {
 			return current($possibleThumbnails);
 		}
 
 		ksort($possibleThumbnails);
 
-		if(key(reset($possibleThumbnails)) > $maxX) {
+		if (key(reset($possibleThumbnails)) > $maxX) {
 			return current(reset($possibleThumbnails));
 		}
 
-		if(key(end($possibleThumbnails)) < $maxX) {
+		if (key(end($possibleThumbnails)) < $maxX) {
 			return current(end($possibleThumbnails));
 		}
 
-		foreach($possibleThumbnails as $width => $path) {
-			if($width < $maxX) {
+		foreach ($possibleThumbnails as $width => $path) {
+			if ($width < $maxX) {
 				continue;
-			}else{
+			} else {
 				return $path;
 			}
 		}
@@ -374,9 +402,9 @@ class Preview {
 	/**
 	 * @brief return a preview of a file
 	 * @return \OC_Image
-	*/
+	 */
 	public function getPreview() {
-		if(!is_null($this->preview) && $this->preview->valid()){
+		if (!is_null($this->preview) && $this->preview->valid()) {
 			return $this->preview;
 		}
 
@@ -386,22 +414,28 @@ class Preview {
 		$maxY = $this->getMaxY();
 		$scalingUp = $this->getScalingUp();
 
-		$fileInfo = $this->fileView->getFileInfo($file);
-		$fileId = $fileInfo['fileid'];
+		$fileInfo = $this->getFileInfo($file);
+		if($fileInfo === null || $fileInfo === false) {
+			return new \OC_Image();
+		}
+		$fileId = $fileInfo->getId();
 
 		$cached = $this->isCached();
 
-		if($cached) {
-			$image = new \OC_Image($this->userView->file_get_contents($cached, 'r'));
+		if ($cached) {
+			$stream = $this->userView->fopen($cached, 'r');
+			$image = new \OC_Image();
+			$image->loadFromFileHandle($stream);
 			$this->preview = $image->valid() ? $image : null;
 			$this->resizeAndCrop();
+			fclose($stream);
 		}
 
-		if(is_null($this->preview)) {
+		if (is_null($this->preview)) {
 			$preview = null;
 
-			foreach(self::$providers as $supportedMimetype => $provider) {
-				if(!preg_match($supportedMimetype, $this->mimetype)) {
+			foreach (self::$providers as $supportedMimetype => $provider) {
+				if (!preg_match($supportedMimetype, $this->mimetype)) {
 					continue;
 				}
 
@@ -409,7 +443,7 @@ class Preview {
 
 				$preview = $provider->getThumbnail($file, $maxX, $maxY, $scalingUp, $this->fileView);
 
-				if(!($preview instanceof \OC_Image)) {
+				if (!($preview instanceof \OC_Image)) {
 					continue;
 				}
 
@@ -419,11 +453,11 @@ class Preview {
 				$previewPath = $this->getThumbnailsFolder() . '/' . $fileId . '/';
 				$cachePath = $previewPath . $maxX . '-' . $maxY . '.png';
 
-				if($this->userView->is_dir($this->getThumbnailsFolder() . '/') === false) {
+				if ($this->userView->is_dir($this->getThumbnailsFolder() . '/') === false) {
 					$this->userView->mkdir($this->getThumbnailsFolder() . '/');
 				}
 
-				if($this->userView->is_dir($previewPath) === false) {
+				if ($this->userView->is_dir($previewPath) === false) {
 					$this->userView->mkdir($previewPath);
 				}
 
@@ -433,7 +467,7 @@ class Preview {
 			}
 		}
 
-		if(is_null($this->preview)) {
+		if (is_null($this->preview)) {
 			$this->preview = new \OC_Image();
 		}
 
@@ -443,20 +477,20 @@ class Preview {
 	/**
 	 * @brief show preview
 	 * @return void
-	*/
+	 */
 	public function showPreview() {
 		\OCP\Response::enableCaching(3600 * 24); // 24 hours
-		if(is_null($this->preview)) {
+		if (is_null($this->preview)) {
 			$this->getPreview();
 		}
-		$this->preview->show();
+		$this->preview->show('image/png');
 		return;
 	}
 
 	/**
 	 * @brief show preview
 	 * @return void
-	*/
+	 */
 	public function show() {
 		$this->showPreview();
 		return;
@@ -465,7 +499,7 @@ class Preview {
 	/**
 	 * @brief resize, crop and fix orientation
 	 * @return void
-	*/
+	 */
 	private function resizeAndCrop() {
 		$image = $this->preview;
 		$x = $this->getMaxX();
@@ -473,17 +507,17 @@ class Preview {
 		$scalingUp = $this->getScalingUp();
 		$maxscalefactor = $this->getMaxScaleFactor();
 
-		if(!($image instanceof \OC_Image)) {
+		if (!($image instanceof \OC_Image)) {
 			\OC_Log::write('core', '$this->preview is not an instance of OC_Image', \OC_Log::DEBUG);
 			return;
 		}
 
 		$image->fixOrientation();
 
-		$realx = (int) $image->width();
-		$realy = (int) $image->height();
+		$realx = (int)$image->width();
+		$realy = (int)$image->height();
 
-		if($x === $realx && $y === $realy) {
+		if ($x === $realx && $y === $realy) {
 			$this->preview = $image;
 			return;
 		}
@@ -491,36 +525,36 @@ class Preview {
 		$factorX = $x / $realx;
 		$factorY = $y / $realy;
 
-		if($factorX >= $factorY) {
+		if ($factorX >= $factorY) {
 			$factor = $factorX;
-		}else{
+		} else {
 			$factor = $factorY;
 		}
 
-		if($scalingUp === false) {
-			if($factor > 1) {
+		if ($scalingUp === false) {
+			if ($factor > 1) {
 				$factor = 1;
 			}
 		}
 
-		if(!is_null($maxscalefactor)) {
-			if($factor > $maxscalefactor) {
+		if (!is_null($maxscalefactor)) {
+			if ($factor > $maxscalefactor) {
 				\OC_Log::write('core', 'scalefactor reduced from ' . $factor . ' to ' . $maxscalefactor, \OC_Log::DEBUG);
 				$factor = $maxscalefactor;
 			}
 		}
 
-		$newXsize = (int) ($realx * $factor);
-		$newYsize = (int) ($realy * $factor);
+		$newXsize = (int)($realx * $factor);
+		$newYsize = (int)($realy * $factor);
 
 		$image->preciseResize($newXsize, $newYsize);
 
-		if($newXsize === $x && $newYsize === $y) {
+		if ($newXsize === $x && $newYsize === $y) {
 			$this->preview = $image;
 			return;
 		}
 
-		if($newXsize >= $x && $newYsize >= $y) {
+		if ($newXsize >= $x && $newYsize >= $y) {
 			$cropX = floor(abs($x - $newXsize) * 0.5);
 			//don't crop previews on the Y axis, this sucks if it's a document.
 			//$cropY = floor(abs($y - $newYsize) * 0.5);
@@ -532,19 +566,19 @@ class Preview {
 			return;
 		}
 
-		if($newXsize < $x || $newYsize < $y) {
-			if($newXsize > $x) {
+		if ($newXsize < $x || $newYsize < $y) {
+			if ($newXsize > $x) {
 				$cropX = floor(($newXsize - $x) * 0.5);
 				$image->crop($cropX, 0, $x, $newYsize);
 			}
 
-			if($newYsize > $y) {
+			if ($newYsize > $y) {
 				$cropY = floor(($newYsize - $y) * 0.5);
 				$image->crop(0, $cropY, $newXsize, $y);
 			}
 
-			$newXsize = (int) $image->width();
-			$newYsize = (int) $image->height();
+			$newXsize = (int)$image->width();
+			$newYsize = (int)$image->height();
 
 			//create transparent background layer
 			$backgroundlayer = imagecreatetruecolor($x, $y);
@@ -573,8 +607,8 @@ class Preview {
 	 * @param array $options
 	 * @return void
 	 */
-	public static function registerProvider($class, $options=array()) {
-		self::$registeredProviders[]=array('class'=>$class, 'options'=>$options);
+	public static function registerProvider($class, $options = array()) {
+		self::$registeredProviders[] = array('class' => $class, 'options' => $options);
 	}
 
 	/**
@@ -582,19 +616,19 @@ class Preview {
 	 * @return void
 	 */
 	private static function initProviders() {
-		if(!\OC_Config::getValue('enable_previews', true)) {
+		if (!\OC_Config::getValue('enable_previews', true)) {
 			$provider = new Preview\Unknown(array());
 			self::$providers = array($provider->getMimeType() => $provider);
 			return;
 		}
 
-		if(count(self::$providers)>0) {
+		if (count(self::$providers) > 0) {
 			return;
 		}
 
-		foreach(self::$registeredProviders as $provider) {
-			$class=$provider['class'];
-			$options=$provider['options'];
+		foreach (self::$registeredProviders as $provider) {
+			$class = $provider['class'];
+			$options = $provider['options'];
 
 			$object = new $class($options);
 
@@ -609,12 +643,35 @@ class Preview {
 		self::post_delete($args);
 	}
 
-	public static function post_delete($args) {
+	public static function prepare_delete_files($args) {
+		self::prepare_delete($args, 'files/');
+	}
+
+	public static function prepare_delete($args, $prefix='') {
 		$path = $args['path'];
-		if(substr($path, 0, 1) === '/') {
+		if (substr($path, 0, 1) === '/') {
 			$path = substr($path, 1);
 		}
-		$preview = new Preview(\OC_User::getUser(), 'files/', $path);
+
+		$view = new \OC\Files\View('/' . \OC_User::getUser() . '/' . $prefix);
+		$info = $view->getFileInfo($path);
+
+		\OC\Preview::$deleteFileMapper = array_merge(
+			\OC\Preview::$deleteFileMapper,
+			array(
+				Files\Filesystem::normalizePath($view->getAbsolutePath($path)) => $info,
+			)
+		);
+	}
+
+	public static function post_delete_files($args) {
+		self::post_delete($args, 'files/');
+	}
+
+	public static function post_delete($args, $prefix='') {
+		$path = Files\Filesystem::normalizePath($args['path']);
+
+		$preview = new Preview(\OC_User::getUser(), $prefix, $path);
 		$preview->deleteAllPreviews();
 	}
 
@@ -622,19 +679,19 @@ class Preview {
 	 * @param string $mimetype
 	 */
 	public static function isMimeSupported($mimetype) {
-		if(!\OC_Config::getValue('enable_previews', true)) {
+		if (!\OC_Config::getValue('enable_previews', true)) {
 			return false;
 		}
 
 		//check if there are preview backends
-		if(empty(self::$providers)) {
+		if (empty(self::$providers)) {
 			self::initProviders();
 		}
 
 		//remove last element because it has the mimetype *
 		$providers = array_slice(self::$providers, 0, -1);
-		foreach($providers as $supportedMimetype => $provider) {
-			if(preg_match($supportedMimetype, $mimetype)) {
+		foreach ($providers as $supportedMimetype => $provider) {
+			if (preg_match($supportedMimetype, $mimetype)) {
 				return true;
 			}
 		}
diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php
index 71cd3bae05..7e0ff51ad2 100644
--- a/lib/private/preview/movies.php
+++ b/lib/private/preview/movies.php
@@ -9,7 +9,7 @@
 namespace OC\Preview;
 
 function findBinaryPath($program) {
-	exec('which ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
+	exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
 	if ($returnCode === 0 && count($output) > 0) {
 		return escapeshellcmd($output[0]);
 	}
diff --git a/lib/private/preview/office-cl.php b/lib/private/preview/office-cl.php
index b11fed13ba..6e4d4321eb 100644
--- a/lib/private/preview/office-cl.php
+++ b/lib/private/preview/office-cl.php
@@ -64,12 +64,12 @@ if (!\OC_Util::runningOnWindows()) {
 				$cmd = \OC_Config::getValue('preview_libreoffice_path', null);
 			}
 
-			$whichLibreOffice = shell_exec('which libreoffice');
+			$whichLibreOffice = shell_exec('command -v libreoffice');
 			if($cmd === '' && !empty($whichLibreOffice)) {
 				$cmd = 'libreoffice';
 			}
 
-			$whichOpenOffice = shell_exec('which openoffice');
+			$whichOpenOffice = shell_exec('command -v openoffice');
 			if($cmd === '' && !empty($whichOpenOffice)) {
 				$cmd = 'openoffice';
 			}
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
index 02bb22e9b9..882c4426e6 100644
--- a/lib/private/preview/office.php
+++ b/lib/private/preview/office.php
@@ -6,24 +6,29 @@
  * See the COPYING-README file.
  */
 //both, libreoffice backend and php fallback, need imagick
-if (extension_loaded('imagick') && count(@\Imagick::queryFormats("PDF")) === 1) {
-	$isShellExecEnabled = \OC_Helper::is_function_enabled('shell_exec');
+if (extension_loaded('imagick')) {
 
-	// LibreOffice preview is currently not supported on Windows
-	if (!\OC_Util::runningOnWindows()) {
-		$whichLibreOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : '');
-		$isLibreOfficeAvailable = !empty($whichLibreOffice);
-		$whichOpenOffice = ($isShellExecEnabled ? shell_exec('which libreoffice') : '');
-		$isOpenOfficeAvailable = !empty($whichOpenOffice);
-		//let's see if there is libreoffice or openoffice on this machine
-		if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {
-			require_once('office-cl.php');
-		}else{
+	$checkImagick = new Imagick();
+
+	if(count($checkImagick->queryFormats('PDF')) === 1) {
+		$isShellExecEnabled = \OC_Helper::is_function_enabled('shell_exec');
+
+		// LibreOffice preview is currently not supported on Windows
+		if (!\OC_Util::runningOnWindows()) {
+			$whichLibreOffice = ($isShellExecEnabled ? shell_exec('command -v libreoffice') : '');
+			$isLibreOfficeAvailable = !empty($whichLibreOffice);
+			$whichOpenOffice = ($isShellExecEnabled ? shell_exec('command -v libreoffice') : '');
+			$isOpenOfficeAvailable = !empty($whichOpenOffice);
+			//let's see if there is libreoffice or openoffice on this machine
+			if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {
+				require_once('office-cl.php');
+			}else{
+				//in case there isn't, use our fallback
+				require_once('office-fallback.php');
+			}
+		} else {
 			//in case there isn't, use our fallback
 			require_once('office-fallback.php');
 		}
-	} else {
-		//in case there isn't, use our fallback
-		require_once('office-fallback.php');
 	}
 }
diff --git a/lib/private/preview/pdf.php b/lib/private/preview/pdf.php
index d390b4fc67..064a5a3b3d 100644
--- a/lib/private/preview/pdf.php
+++ b/lib/private/preview/pdf.php
@@ -7,34 +7,41 @@
  */
 namespace OC\Preview;
 
-if (extension_loaded('imagick') && count(@\Imagick::queryFormats("PDF")) === 1) {
+use Imagick;
 
-	class PDF extends Provider {
+if (extension_loaded('imagick')) {
 
-		public function getMimeType() {
-			return '/application\/pdf/';
-		}
+	$checkImagick = new Imagick();
 
-		public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {	
-			$tmpPath = $fileview->toTmpFile($path);
+	if(count($checkImagick->queryFormats('PDF')) === 1) {
 
-			//create imagick object from pdf
-			try{
-				$pdf = new \imagick($tmpPath . '[0]');
-				$pdf->setImageFormat('jpg');
-			} catch (\Exception $e) {
-				\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
-				return false;
+		class PDF extends Provider {
+
+			public function getMimeType() {
+				return '/application\/pdf/';
 			}
 
-			unlink($tmpPath);
+			public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+				$tmpPath = $fileview->toTmpFile($path);
 
-			//new image object
-			$image = new \OC_Image($pdf);
-			//check if image object is valid
-			return $image->valid() ? $image : false;
+				//create imagick object from pdf
+				try{
+					$pdf = new Imagick($tmpPath . '[0]');
+					$pdf->setImageFormat('jpg');
+				} catch (\Exception $e) {
+					\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
+					return false;
+				}
+
+				unlink($tmpPath);
+
+				//new image object
+				$image = new \OC_Image($pdf);
+				//check if image object is valid
+				return $image->valid() ? $image : false;
+			}
 		}
-	}
 
-	\OC\Preview::registerProvider('OC\Preview\PDF');
+		\OC\Preview::registerProvider('OC\Preview\PDF');
+	}
 }
diff --git a/lib/private/preview/svg.php b/lib/private/preview/svg.php
index 9a73fff946..505122fddb 100644
--- a/lib/private/preview/svg.php
+++ b/lib/private/preview/svg.php
@@ -7,40 +7,46 @@
  */
 namespace OC\Preview;
 
-if (extension_loaded('imagick') && count(@\Imagick::queryFormats("SVG")) === 1) {
+use Imagick;
 
-	class SVG extends Provider {
+if (extension_loaded('imagick')) {
 
-		public function getMimeType() {
-			return '/image\/svg\+xml/';
-		}
+	$checkImagick = new Imagick();
 
-		public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) {
-			try{
-				$svg = new \Imagick();
-				$svg->setBackgroundColor(new \ImagickPixel('transparent'));
+	if(count($checkImagick->queryFormats('SVG')) === 1) {
 
-				$content = stream_get_contents($fileview->fopen($path, 'r'));
-				if(substr($content, 0, 5) !== '<?xml') {
-					$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
-				}
+		class SVG extends Provider {
 
-				$svg->readImageBlob($content);
-				$svg->setImageFormat('png32');
-			} catch (\Exception $e) {
-				\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
-				return false;
+			public function getMimeType() {
+				return '/image\/svg\+xml/';
 			}
 
+			public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) {
+				try{
+					$svg = new Imagick();
+					$svg->setBackgroundColor(new \ImagickPixel('transparent'));
 
-			//new image object
-			$image = new \OC_Image();
-			$image->loadFromData($svg);
-			//check if image object is valid
-			return $image->valid() ? $image : false;
+					$content = stream_get_contents($fileview->fopen($path, 'r'));
+					if(substr($content, 0, 5) !== '<?xml') {
+						$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
+					}
+
+					$svg->readImageBlob($content);
+					$svg->setImageFormat('png32');
+				} catch (\Exception $e) {
+					\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
+					return false;
+				}
+
+
+				//new image object
+				$image = new \OC_Image();
+				$image->loadFromData($svg);
+				//check if image object is valid
+				return $image->valid() ? $image : false;
+			}
 		}
+
+		\OC\Preview::registerProvider('OC\Preview\SVG');
 	}
-
-	\OC\Preview::registerProvider('OC\Preview\SVG');
-
 }
\ No newline at end of file
diff --git a/lib/private/request.php b/lib/private/request.php
index 59a9e395e8..8041c4f004 100755
--- a/lib/private/request.php
+++ b/lib/private/request.php
@@ -13,6 +13,8 @@ class OC_Request {
 	const USER_AGENT_ANDROID_MOBILE_CHROME = '#Android.*Chrome/[.0-9]*#';
 	const USER_AGENT_FREEBOX = '#^Mozilla/5\.0$#';
 
+	const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)(:[0-9]+|)$/';
+
 	/**
 	 * @brief Check overwrite condition
 	 * @param string $type
@@ -25,17 +27,68 @@ class OC_Request {
 	}
 
 	/**
-	 * @brief Checks whether a domain is considered as trusted. This is used to prevent Host Header Poisoning.
-	 * @param string $domain
-	 * @return bool
+	 * @brief Checks whether a domain is considered as trusted from the list
+	 * of trusted domains. If no trusted domains have been configured, returns
+	 * true.
+	 * This is used to prevent Host Header Poisoning.
+	 * @param string $host
+	 * @return bool true if the given domain is trusted or if no trusted domains
+	 * have been configured
 	 */
 	public static function isTrustedDomain($domain) {
-		$trustedList = \OC_Config::getValue('trusted_domains', array(''));
+		$trustedList = \OC_Config::getValue('trusted_domains', array());
+		if (empty($trustedList)) {
+			return true;
+		}
+		if (preg_match(self::REGEX_LOCALHOST, $domain) === 1) {
+			return true;
+		}
 		return in_array($domain, $trustedList);
 	}
 
 	/**
-	 * @brief Returns the server host
+	 * @brief Returns the unverified server host from the headers without checking
+	 * whether it is a trusted domain
+	 * @returns string the server host
+	 *
+	 * Returns the server host, even if the website uses one or more
+	 * reverse proxies
+	 */
+	public static function insecureServerHost() {
+		$host = null;
+		if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
+			if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) {
+				$parts = explode(',', $_SERVER['HTTP_X_FORWARDED_HOST']);
+				$host = trim(current($parts));
+			} else {
+				$host = $_SERVER['HTTP_X_FORWARDED_HOST'];
+			}
+		} else {
+			if (isset($_SERVER['HTTP_HOST'])) {
+				$host = $_SERVER['HTTP_HOST'];
+			} else if (isset($_SERVER['SERVER_NAME'])) {
+				$host = $_SERVER['SERVER_NAME'];
+			}
+		}
+		return $host;
+	}
+
+	/**
+	 * Returns the overwritehost setting from the config if set and
+	 * if the overwrite condition is met
+	 * @return overwritehost value or null if not defined or the defined condition
+	 * isn't met
+	 */
+	public static function getOverwriteHost() {
+		if(OC_Config::getValue('overwritehost', '') !== '' and self::isOverwriteCondition()) {
+			return OC_Config::getValue('overwritehost');
+		}
+		return null;
+	}
+
+	/**
+	 * @brief Returns the server host from the headers, or the first configured
+	 * trusted domain if the host isn't in the trusted list
 	 * @returns string the server host
 	 *
 	 * Returns the server host, even if the website uses one or more
@@ -45,29 +98,20 @@ class OC_Request {
 		if(OC::$CLI) {
 			return 'localhost';
 		}
-		if(OC_Config::getValue('overwritehost', '') !== '' and self::isOverwriteCondition()) {
-			return OC_Config::getValue('overwritehost');
-		}
-		if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
-			if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) {
-				$host = trim(array_pop(explode(",", $_SERVER['HTTP_X_FORWARDED_HOST'])));
-			}
-			else{
-				$host = $_SERVER['HTTP_X_FORWARDED_HOST'];
-			}
-		} else {
-			if (isset($_SERVER['HTTP_HOST'])) {
-				$host = $_SERVER['HTTP_HOST'];
-			}
-			else if (isset($_SERVER['SERVER_NAME'])) {
-				$host = $_SERVER['SERVER_NAME'];
-			}
+
+		// overwritehost is always trusted
+		$host = self::getOverwriteHost();
+		if ($host !== null) {
+			return $host;
 		}
 
+		// get the host from the headers
+		$host = self::insecureServerHost();
+
 		// Verify that the host is a trusted domain if the trusted domains
 		// are defined
 		// If no trusted domain is provided the first trusted domain is returned
-		if(self::isTrustedDomain($host) || \OC_Config::getValue('trusted_domains', "") === "") {
+		if (self::isTrustedDomain($host)) {
 			return $host;
 		} else {
 			$trustedList = \OC_Config::getValue('trusted_domains', array(''));
diff --git a/lib/private/response.php b/lib/private/response.php
index 71c538fb31..983c682bf3 100644
--- a/lib/private/response.php
+++ b/lib/private/response.php
@@ -12,6 +12,7 @@ class OC_Response {
 	const STATUS_TEMPORARY_REDIRECT = 307;
 	const STATUS_NOT_FOUND = 404;
 	const STATUS_INTERNAL_SERVER_ERROR = 500;
+	const STATUS_SERVICE_UNAVAILABLE = 503;
 
 	/**
 	* @brief Enable response caching by sending correct HTTP headers
@@ -74,6 +75,9 @@ class OC_Response {
 			case self::STATUS_INTERNAL_SERVER_ERROR;
 				$status = $status . ' Internal Server Error';
 				break;
+			case self::STATUS_SERVICE_UNAVAILABLE;
+				$status = $status . ' Service Unavailable';
+				break;
 		}
 		header($protocol.' '.$status);
 	}
diff --git a/lib/private/route/cachingrouter.php b/lib/private/route/cachingrouter.php
new file mode 100644
index 0000000000..ad25372391
--- /dev/null
+++ b/lib/private/route/cachingrouter.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (c) 2014 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\Route;
+
+class CachingRouter extends Router {
+	/**
+	 * @var \OCP\ICache
+	 */
+	protected $cache;
+
+	/**
+	 * @param \OCP\ICache $cache
+	 */
+	public function __construct($cache) {
+		$this->cache = $cache;
+		parent::__construct();
+	}
+
+	/**
+	 * Generate url based on $name and $parameters
+	 *
+	 * @param string $name Name of the route to use.
+	 * @param array $parameters Parameters for the route
+	 * @param bool $absolute
+	 * @return string
+	 */
+	public function generate($name, $parameters = array(), $absolute = false) {
+		$key = $name . json_encode($parameters) . $absolute;
+		if ($this->cache->hasKey($key)) {
+			return $this->cache->get($key);
+		} else {
+			$url = parent::generate($name, $parameters, $absolute);
+			$this->cache->set($key, $url, 3600);
+			return $url;
+		}
+	}
+}
diff --git a/lib/private/route.php b/lib/private/route/route.php
similarity index 90%
rename from lib/private/route.php
rename to lib/private/route/route.php
index fb7da456b6..6ade9ec15f 100644
--- a/lib/private/route.php
+++ b/lib/private/route/route.php
@@ -6,13 +6,17 @@
  * See the COPYING-README file.
  */
 
-use Symfony\Component\Routing\Route;
+namespace OC\Route;
 
-class OC_Route extends Route {
+use OCP\Route\IRoute;
+use Symfony\Component\Routing\Route as SymfonyRoute;
+
+class Route extends SymfonyRoute implements IRoute {
 	/**
 	 * Specify the method when this route is to be used
 	 *
 	 * @param string $method HTTP method (uppercase)
+	 * @return \OC\Route\Route
 	 */
 	public function method($method) {
 		$this->setRequirement('_method', strtoupper($method));
@@ -63,6 +67,7 @@ class OC_Route extends Route {
 	 * Defaults to use for this route
 	 *
 	 * @param array $defaults The defaults
+	 * @return \OC\Route\Route
 	 */
 	public function defaults($defaults) {
 		$action = $this->getDefault('action');
@@ -78,6 +83,7 @@ class OC_Route extends Route {
 	 * Requirements for this route
 	 *
 	 * @param array $requirements The requirements
+	 * @return \OC\Route\Route
 	 */
 	public function requirements($requirements) {
 		$method = $this->getRequirement('_method');
@@ -93,8 +99,10 @@ class OC_Route extends Route {
 
 	/**
 	 * The action to execute when this route matches
+	 *
 	 * @param string|callable $class the class or a callable
 	 * @param string $function the function to use with the class
+	 * @return \OC\Route\Route
 	 *
 	 * This function is called with $class set to a callable or
 	 * to the class with $function
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
new file mode 100644
index 0000000000..1f0a23ee12
--- /dev/null
+++ b/lib/private/route/router.php
@@ -0,0 +1,233 @@
+<?php
+/**
+ * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Route;
+
+use OCP\Route\IRouter;
+use Symfony\Component\Routing\Matcher\UrlMatcher;
+use Symfony\Component\Routing\Generator\UrlGenerator;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
+
+class Router implements IRouter {
+	/**
+	 * @var \Symfony\Component\Routing\RouteCollection[]
+	 */
+	protected $collections = array();
+
+	/**
+	 * @var \Symfony\Component\Routing\RouteCollection
+	 */
+	protected $collection = null;
+
+	/**
+	 * @var \Symfony\Component\Routing\RouteCollection
+	 */
+	protected $root = null;
+
+	/**
+	 * @var \Symfony\Component\Routing\Generator\UrlGenerator
+	 */
+	protected $generator = null;
+
+	/**
+	 * @var string[]
+	 */
+	protected $routingFiles;
+
+	/**
+	 * @var string
+	 */
+	protected $cacheKey;
+
+	protected $loaded = false;
+
+	protected $loadedApps = array();
+
+	public function __construct() {
+		$baseUrl = \OC_Helper::linkTo('', 'index.php');
+		if (!\OC::$CLI) {
+			$method = $_SERVER['REQUEST_METHOD'];
+		} else {
+			$method = 'GET';
+		}
+		$host = \OC_Request::serverHost();
+		$schema = \OC_Request::serverProtocol();
+		$this->context = new RequestContext($baseUrl, $method, $host, $schema);
+		// TODO cache
+		$this->root = $this->getCollection('root');
+	}
+
+	/**
+	 * Get the files to load the routes from
+	 *
+	 * @return string[]
+	 */
+	public function getRoutingFiles() {
+		if (!isset($this->routingFiles)) {
+			$this->routingFiles = array();
+			foreach (\OC_APP::getEnabledApps() as $app) {
+				$file = \OC_App::getAppPath($app) . '/appinfo/routes.php';
+				if (file_exists($file)) {
+					$this->routingFiles[$app] = $file;
+				}
+			}
+		}
+		return $this->routingFiles;
+	}
+
+	public function getCacheKey() {
+		if (!isset($this->cacheKey)) {
+			$files = $this->getRoutingFiles();
+			$files[] = 'settings/routes.php';
+			$files[] = 'core/routes.php';
+			$files[] = 'ocs/routes.php';
+			$this->cacheKey = \OC_Cache::generateCacheKeyFromFiles($files);
+		}
+		return $this->cacheKey;
+	}
+
+	/**
+	 * loads the api routes
+	 */
+	public function loadRoutes($app = null) {
+		if ($this->loaded) {
+			return;
+		}
+		if (is_null($app)) {
+			$this->loaded = true;
+			$routingFiles = $this->getRoutingFiles();
+		} else {
+			if (isset($this->loadedApps[$app])) {
+				return;
+			}
+			$file = \OC_App::getAppPath($app) . '/appinfo/routes.php';
+			if (file_exists($file)) {
+				$routingFiles = array($app => $file);
+			} else {
+				$routingFiles = array();
+			}
+		}
+		foreach ($routingFiles as $app => $file) {
+			if (!isset($this->loadedApps[$app])) {
+				$this->loadedApps[$app] = true;
+				$this->useCollection($app);
+				require_once $file;
+				$collection = $this->getCollection($app);
+				$collection->addPrefix('/apps/' . $app);
+				$this->root->addCollection($collection);
+			}
+		}
+		if (!isset($this->loadedApps['core'])) {
+			$this->loadedApps['core'] = true;
+			$this->useCollection('root');
+			require_once 'settings/routes.php';
+			require_once 'core/routes.php';
+
+			// include ocs routes
+			require_once 'ocs/routes.php';
+			$collection = $this->getCollection('ocs');
+			$collection->addPrefix('/ocs');
+			$this->root->addCollection($collection);
+		}
+	}
+
+	/**
+	 * @param string $name
+	 * @return \Symfony\Component\Routing\RouteCollection
+	 */
+	protected function getCollection($name) {
+		if (!isset($this->collections[$name])) {
+			$this->collections[$name] = new RouteCollection();
+		}
+		return $this->collections[$name];
+	}
+
+	/**
+	 * Sets the collection to use for adding routes
+	 *
+	 * @param string $name Name of the collection to use.
+	 */
+	public function useCollection($name) {
+		$this->collection = $this->getCollection($name);
+	}
+
+	/**
+	 * Create a \OC\Route\Route.
+	 *
+	 * @param string $name Name of the route to create.
+	 * @param string $pattern The pattern to match
+	 * @param array $defaults An array of default parameter values
+	 * @param array $requirements An array of requirements for parameters (regexes)
+	 * @return \OC\Route\Route
+	 */
+	public function create($name, $pattern, array $defaults = array(), array $requirements = array()) {
+		$route = new Route($pattern, $defaults, $requirements);
+		$this->collection->add($name, $route);
+		return $route;
+	}
+
+	/**
+	 * Find the route matching $url
+	 *
+	 * @param string $url The url to find
+	 * @throws \Exception
+	 */
+	public function match($url) {
+		if (substr($url, 0, 6) === '/apps/') {
+			// empty string / 'apps' / $app / rest of the route
+			list(, , $app,) = explode('/', $url, 4);
+			$this->loadRoutes($app);
+		} else if (substr($url, 0, 6) === '/core/' or substr($url, 0, 5) === '/ocs/' or substr($url, 0, 10) === '/settings/') {
+			$this->loadRoutes('core');
+		} else {
+			$this->loadRoutes();
+		}
+		$matcher = new UrlMatcher($this->root, $this->context);
+		$parameters = $matcher->match($url);
+		if (isset($parameters['action'])) {
+			$action = $parameters['action'];
+			if (!is_callable($action)) {
+				var_dump($action);
+				throw new \Exception('not a callable action');
+			}
+			unset($parameters['action']);
+			call_user_func($action, $parameters);
+		} elseif (isset($parameters['file'])) {
+			include $parameters['file'];
+		} else {
+			throw new \Exception('no action available');
+		}
+	}
+
+	/**
+	 * Get the url generator
+	 *
+	 */
+	public function getGenerator() {
+		if (null !== $this->generator) {
+			return $this->generator;
+		}
+
+		return $this->generator = new UrlGenerator($this->root, $this->context);
+	}
+
+	/**
+	 * Generate url based on $name and $parameters
+	 *
+	 * @param string $name Name of the route to use.
+	 * @param array $parameters Parameters for the route
+	 * @param bool $absolute
+	 * @return string
+	 */
+	public function generate($name, $parameters = array(), $absolute = false) {
+		$this->loadRoutes();
+		return $this->getGenerator()->generate($name, $parameters, $absolute);
+	}
+
+}
diff --git a/lib/private/router.php b/lib/private/router.php
deleted file mode 100644
index 19c1e4473e..0000000000
--- a/lib/private/router.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-use Symfony\Component\Routing\Matcher\UrlMatcher;
-use Symfony\Component\Routing\Generator\UrlGenerator;
-use Symfony\Component\Routing\RequestContext;
-use Symfony\Component\Routing\RouteCollection;
-//use Symfony\Component\Routing\Route;
-
-class OC_Router {
-	protected $collections = array();
-	protected $collection = null;
-	protected $root = null;
-
-	protected $generator = null;
-	protected $routing_files;
-	protected $cache_key;
-
-	public function __construct() {
-		$baseUrl = OC_Helper::linkTo('', 'index.php');
-		if ( !OC::$CLI) {
-			$method = $_SERVER['REQUEST_METHOD'];
-		}else{
-			$method = 'GET';
-		}
-		$host = OC_Request::serverHost();
-		$schema = OC_Request::serverProtocol();
-		$this->context = new RequestContext($baseUrl, $method, $host, $schema);
-		// TODO cache
-		$this->root = $this->getCollection('root');
-	}
-
-	public function getRoutingFiles() {
-		if (!isset($this->routing_files)) {
-			$this->routing_files = array();
-			foreach(OC_APP::getEnabledApps() as $app) {
-				$file = OC_App::getAppPath($app).'/appinfo/routes.php';
-				if(file_exists($file)) {
-					$this->routing_files[$app] = $file;
-				}
-			}
-		}
-		return $this->routing_files;
-	}
-
-	public function getCacheKey() {
-		if (!isset($this->cache_key)) {
-			$files = $this->getRoutingFiles();
-			$files[] = 'settings/routes.php';
-			$files[] = 'core/routes.php';
-			$files[] = 'ocs/routes.php';
-			$this->cache_key = OC_Cache::generateCacheKeyFromFiles($files);
-		}
-		return $this->cache_key;
-	}
-
-	/**
-	 * loads the api routes
-	 */
-	public function loadRoutes() {
-		foreach($this->getRoutingFiles() as $app => $file) {
-			$this->useCollection($app);
-			require_once $file;
-			$collection = $this->getCollection($app);
-			$collection->addPrefix('/apps/'.$app);
-			$this->root->addCollection($collection);
-		}
-		$this->useCollection('root');
-		require_once 'settings/routes.php';
-		require_once 'core/routes.php';
-
-		// include ocs routes
-		require_once 'ocs/routes.php';
-		$collection = $this->getCollection('ocs');
-		$collection->addPrefix('/ocs');
-		$this->root->addCollection($collection);
-	}
-
-	protected function getCollection($name) {
-		if (!isset($this->collections[$name])) {
-			$this->collections[$name] = new RouteCollection();
-		}
-		return $this->collections[$name];
-	}
-
-	/**
-	 * Sets the collection to use for adding routes
-	 *
-	 * @param string $name Name of the colletion to use.
-	 */
-	public function useCollection($name) {
-		$this->collection = $this->getCollection($name);
-	}
-
-	/**
-	 * Create a OC_Route.
-	 *
-	 * @param string $name Name of the route to create.
-	 * @param string $pattern The pattern to match
-	 * @param array  $defaults     An array of default parameter values
-	 * @param array  $requirements An array of requirements for parameters (regexes)
-	 */
-	public function create($name, $pattern, array $defaults = array(), array $requirements = array()) {
-		$route = new OC_Route($pattern, $defaults, $requirements);
-		$this->collection->add($name, $route);
-		return $route;
-	}
-
-	/**
-	 * Find the route matching $url.
-	 *
-	 * @param string $url The url to find
-	 */
-	public function match($url) {
-		$matcher = new UrlMatcher($this->root, $this->context);
-		$parameters = $matcher->match($url);
-		if (isset($parameters['action'])) {
-			$action = $parameters['action'];
-			if (!is_callable($action)) {
-				var_dump($action);
-				throw new Exception('not a callable action');
-			}
-			unset($parameters['action']);
-			call_user_func($action, $parameters);
-		} elseif (isset($parameters['file'])) {
-			include $parameters['file'];
-		} else {
-			throw new Exception('no action available');
-		}
-	}
-
-	/**
-	 * Get the url generator
-	 *
-	 */
-	public function getGenerator()
-	{
-		if (null !== $this->generator) {
-			return $this->generator;
-		}
-
-		return $this->generator = new UrlGenerator($this->root, $this->context);
-	}
-
-	/**
-	 * Generate url based on $name and $parameters
-	 *
-	 * @param string $name Name of the route to use.
-	 * @param array $parameters Parameters for the route
-	 */
-	public function generate($name, $parameters = array(), $absolute = false)
-	{
-		return $this->getGenerator()->generate($name, $parameters, $absolute);
-	}
-
-	/**
-	 * Generate JSON response for routing in javascript
-	 */
-	public static function JSRoutes()
-	{
-		$router = OC::getRouter();
-
-		$etag = $router->getCacheKey();
-		OC_Response::enableCaching();
-		OC_Response::setETagHeader($etag);
-
-		$root = $router->getCollection('root');
-		$routes = array();
-		foreach($root->all() as $name => $route) {
-			$compiled_route = $route->compile();
-			$defaults = $route->getDefaults();
-			unset($defaults['action']);
-			$routes[$name] = array(
-				'tokens' => $compiled_route->getTokens(),
-				'defaults' => $defaults,
-			);
-		}
-		OCP\JSON::success ( array( 'data' => $routes ) );
-	}
-}
diff --git a/lib/private/server.php b/lib/private/server.php
index 3255713e12..3517d7b354 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -158,6 +158,18 @@ class Server extends SimpleContainer implements IServerContainer {
 			$config = $c->getConfig();
 			return new \OC\BackgroundJob\JobList($c->getDatabaseConnection(), $config);
 		});
+		$this->registerService('Router', function ($c){
+			/**
+			 * @var Server $c
+			 */
+			$cacheFactory = $c->getMemCacheFactory();
+			if ($cacheFactory->isAvailable()) {
+				$router = new \OC\Route\CachingRouter($cacheFactory->create('route'));
+			} else {
+				$router = new \OC\Route\Router();
+			}
+			return $router;
+		});
 	}
 
 	/**
@@ -323,7 +335,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	/**
 	 * Returns an \OCP\CacheFactory instance
 	 *
-	 * @return \OCP\CacheFactory
+	 * @return \OCP\ICacheFactory
 	 */
 	function getMemCacheFactory() {
 		return $this->query('MemCacheFactory');
@@ -364,4 +376,13 @@ class Server extends SimpleContainer implements IServerContainer {
 	function getJobList(){
 		return $this->query('JobList');
 	}
+
+	/**
+	 * Returns a router for generating and matching urls
+	 *
+	 * @return \OCP\Route\IRouter
+	 */
+	function getRouter(){
+		return $this->query('Router');
+	}
 }
diff --git a/lib/private/session/internal.php b/lib/private/session/internal.php
index a7c9e2fdef..42ec9606dc 100644
--- a/lib/private/session/internal.php
+++ b/lib/private/session/internal.php
@@ -26,8 +26,7 @@ class Internal extends Memory {
 	}
 
 	public function __destruct() {
-		$_SESSION = array_merge($_SESSION, $this->data);
-		session_write_close();
+		$this->close();
 	}
 
 	/**
@@ -47,4 +46,15 @@ class Internal extends Memory {
 		@session_start();
 		$this->data = $_SESSION = array();
 	}
+
+	public function close() {
+		$_SESSION = array_merge($_SESSION, $this->data);
+		session_write_close();
+
+		parent::close();
+	}
+
+    public function reopen() {
+        throw new \Exception('The session cannot be reopened - reopen() is ony to be used in unit testing.');
+    }
 }
diff --git a/lib/private/session/memory.php b/lib/private/session/memory.php
index 1b9ac45257..1497c0f892 100644
--- a/lib/private/session/memory.php
+++ b/lib/private/session/memory.php
@@ -28,6 +28,7 @@ class Memory extends Session {
 	 * @param integer $value
 	 */
 	public function set($key, $value) {
+		$this->validateSession();
 		$this->data[$key] = $value;
 	}
 
@@ -54,10 +55,29 @@ class Memory extends Session {
 	 * @param string $key
 	 */
 	public function remove($key) {
+		$this->validateSession();
 		unset($this->data[$key]);
 	}
 
 	public function clear() {
 		$this->data = array();
 	}
+
+	/**
+	 * Helper function for PHPUnit execution - don't use in non-test code
+	 */
+	public function reopen() {
+		$this->sessionClosed = false;
+	}
+
+	/**
+	 * In case the session has already been locked an exception will be thrown
+	 *
+	 * @throws \Exception
+	 */
+	private function validateSession() {
+		if ($this->sessionClosed) {
+			throw new \Exception('Session has been closed - no further changes to the session as allowed');
+		}
+	}
 }
diff --git a/lib/private/session/session.php b/lib/private/session/session.php
index fe160faa26..6f6c804f38 100644
--- a/lib/private/session/session.php
+++ b/lib/private/session/session.php
@@ -12,6 +12,11 @@ use OCP\ISession;
 
 abstract class Session implements \ArrayAccess, ISession {
 
+	/**
+	 * @var bool
+	 */
+	protected $sessionClosed = false;
+
 	/**
 	 * $name serves as a namespace for the session keys
 	 *
@@ -49,4 +54,11 @@ abstract class Session implements \ArrayAccess, ISession {
 	public function offsetUnset($offset) {
 		$this->remove($offset);
 	}
+
+	/**
+	 * Close the session and release the lock
+	 */
+	public function close() {
+		$this->sessionClosed = true;
+	}
 }
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 3906204bda..b1061b3a25 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -106,6 +106,10 @@ class OC_Setup {
 			//guess what this does
 			OC_Installer::installShippedApps();
 
+			// create empty file in data dir, so we can later find
+			// out that this is indeed an ownCloud data directory
+			file_put_contents(OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data').'/.ocdata', '');
+
 			//create htaccess files for apache hosts
 			if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
 				self::createHtaccess();
@@ -147,7 +151,7 @@ class OC_Setup {
 		$content.= "RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]\n";
 		$content.= "RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]\n";
 		$content.= "RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]\n";
-		$content.= "RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]\n";
+		$content.= "RewriteRule ^apps/([^/]*)/(.*\.(php))$ index.php?app=$1&getfile=$2 [QSA,L]\n";
 		$content.= "RewriteRule ^remote/(.*) remote.php [QSA,L]\n";
 		$content.= "</IfModule>\n";
 		$content.= "<IfModule mod_mime.c>\n";
diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php
index 89d328ada1..4d0c9b52a4 100644
--- a/lib/private/setup/postgresql.php
+++ b/lib/private/setup/postgresql.php
@@ -10,13 +10,20 @@ class PostgreSQL extends AbstractDatabase {
 		$e_user = addslashes($this->dbuser);
 		$e_password = addslashes($this->dbpassword);
 
+		// Fix database with port connection
+		if(strpos($e_host, ':')) {
+			list($e_host, $port)=explode(':', $e_host, 2);
+		} else {
+			$port=false;
+		}
+
 		//check if the database user has admin rights
-		$connection_string = "host='$e_host' dbname=postgres user='$e_user' password='$e_password'";
+		$connection_string = "host='$e_host' dbname=postgres user='$e_user' port='$port' password='$e_password'";
 		$connection = @pg_connect($connection_string);
 		if(!$connection) {
 			// Try if we can connect to the DB with the specified name
 			$e_dbname = addslashes($this->dbname);
-			$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
+			$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' port='$port' password='$e_password'";
 			$connection = @pg_connect($connection_string);
 
 			if(!$connection)
@@ -63,7 +70,14 @@ class PostgreSQL extends AbstractDatabase {
 		$e_user = addslashes($this->dbuser);
 		$e_password = addslashes($this->dbpassword);
 
-		$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' password='$e_password'";
+        	// Fix database with port connection
+		if(strpos($e_host, ':')) {
+			list($e_host, $port)=explode(':', $e_host, 2);
+		} else {
+			$port=false;
+		}
+
+		$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' port='$port' password='$e_password'";
 		$connection = @pg_connect($connection_string);
 		if(!$connection) {
 			throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
diff --git a/lib/private/share/constants.php b/lib/private/share/constants.php
new file mode 100644
index 0000000000..7e4223d10f
--- /dev/null
+++ b/lib/private/share/constants.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OC\Share;
+
+class Constants {
+
+	const SHARE_TYPE_USER = 0;
+	const SHARE_TYPE_GROUP = 1;
+	const SHARE_TYPE_LINK = 3;
+	const SHARE_TYPE_EMAIL = 4;
+	const SHARE_TYPE_CONTACT = 5;
+	const SHARE_TYPE_REMOTE = 6;
+
+	const FORMAT_NONE = -1;
+	const FORMAT_STATUSES = -2;
+	const FORMAT_SOURCES = -3;
+
+	const TOKEN_LENGTH = 32; // see db_structure.xml
+
+	protected static $shareTypeUserAndGroups = -1;
+	protected static $shareTypeGroupUserUnique = 2;
+	protected static $backends = array();
+	protected static $backendTypes = array();
+	protected static $isResharingAllowed;
+}
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
new file mode 100644
index 0000000000..fde5566728
--- /dev/null
+++ b/lib/private/share/helper.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OC\Share;
+
+class Helper extends \OC\Share\Constants {
+
+	/**
+	 * Generate a unique target for the item
+	 * @param string Item type
+	 * @param string Item source
+	 * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+	 * @param string User or group the item is being shared with
+	 * @param string User that is the owner of shared item
+	 * @param string The suggested target originating from a reshare (optional)
+	 * @param int The id of the parent group share (optional)
+	 * @return string Item target
+	 */
+	public static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
+		$suggestedTarget = null, $groupParent = null) {
+		$backend = \OC\Share\Share::getBackend($itemType);
+		if ($shareType == self::SHARE_TYPE_LINK) {
+			if (isset($suggestedTarget)) {
+				return $suggestedTarget;
+			}
+			return $backend->generateTarget($itemSource, false);
+		} else {
+			if ($itemType == 'file' || $itemType == 'folder') {
+				$column = 'file_target';
+				$columnSource = 'file_source';
+			} else {
+				$column = 'item_target';
+				$columnSource = 'item_source';
+			}
+			if ($shareType == self::SHARE_TYPE_USER) {
+				// Share with is a user, so set share type to user and groups
+				$shareType = self::$shareTypeUserAndGroups;
+				$userAndGroups = array_merge(array($shareWith), \OC_Group::getUserGroups($shareWith));
+			} else {
+				$userAndGroups = false;
+			}
+			$exclude = null;
+			// Backend has 3 opportunities to generate a unique target
+			for ($i = 0; $i < 2; $i++) {
+				// Check if suggested target exists first
+				if ($i == 0 && isset($suggestedTarget)) {
+					$target = $suggestedTarget;
+				} else {
+					if ($shareType == self::SHARE_TYPE_GROUP) {
+						$target = $backend->generateTarget($itemSource, false, $exclude);
+					} else {
+						$target = $backend->generateTarget($itemSource, $shareWith, $exclude);
+					}
+					if (is_array($exclude) && in_array($target, $exclude)) {
+						break;
+					}
+				}
+				// Check if target already exists
+				$checkTarget = \OC\Share\Share::getItems($itemType, $target, $shareType, $shareWith);
+				if (!empty($checkTarget)) {
+					foreach ($checkTarget as $item) {
+						// Skip item if it is the group parent row
+						if (isset($groupParent) && $item['id'] == $groupParent) {
+							if (count($checkTarget) == 1) {
+								return $target;
+							} else {
+								continue;
+							}
+						}
+						if ($item['uid_owner'] == $uidOwner) {
+							if ($itemType == 'file' || $itemType == 'folder') {
+								$meta = \OC\Files\Filesystem::getFileInfo($itemSource);
+								if ($item['file_source'] == $meta['fileid']) {
+									return $target;
+								}
+							} else if ($item['item_source'] == $itemSource) {
+								return $target;
+							}
+						}
+					}
+					if (!isset($exclude)) {
+						$exclude = array();
+					}
+					// Find similar targets to improve backend's chances to generate a unqiue target
+					if ($userAndGroups) {
+						if ($column == 'file_target') {
+							$checkTargets = \OC_DB::prepare('SELECT `'.$column.'` FROM `*PREFIX*share`'
+								.' WHERE `item_type` IN (\'file\', \'folder\')'
+								.' AND `share_type` IN (?,?,?)'
+								.' AND `share_with` IN (\''.implode('\',\'', $userAndGroups).'\')');
+							$result = $checkTargets->execute(array(self::SHARE_TYPE_USER, self::SHARE_TYPE_GROUP,
+								self::$shareTypeGroupUserUnique));
+						} else {
+							$checkTargets = \OC_DB::prepare('SELECT `'.$column.'` FROM `*PREFIX*share`'
+								.' WHERE `item_type` = ? AND `share_type` IN (?,?,?)'
+								.' AND `share_with` IN (\''.implode('\',\'', $userAndGroups).'\')');
+							$result = $checkTargets->execute(array($itemType, self::SHARE_TYPE_USER,
+								self::SHARE_TYPE_GROUP, self::$shareTypeGroupUserUnique));
+						}
+					} else {
+						if ($column == 'file_target') {
+							$checkTargets = \OC_DB::prepare('SELECT `'.$column.'` FROM `*PREFIX*share`'
+								.' WHERE `item_type` IN (\'file\', \'folder\')'
+								.' AND `share_type` = ? AND `share_with` = ?');
+							$result = $checkTargets->execute(array(self::SHARE_TYPE_GROUP, $shareWith));
+						} else {
+							$checkTargets = \OC_DB::prepare('SELECT `'.$column.'` FROM `*PREFIX*share`'
+								.' WHERE `item_type` = ? AND `share_type` = ? AND `share_with` = ?');
+							$result = $checkTargets->execute(array($itemType, self::SHARE_TYPE_GROUP, $shareWith));
+						}
+					}
+					while ($row = $result->fetchRow()) {
+						$exclude[] = $row[$column];
+					}
+				} else {
+					return $target;
+				}
+			}
+		}
+		$message = 'Sharing backend registered for '.$itemType.' did not generate a unique target for '.$itemSource;
+		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+		throw new \Exception($message);
+	}
+
+	/**
+	 * Delete all reshares of an item
+	 * @param int Id of item to delete
+	 * @param bool If true, exclude the parent from the delete (optional)
+	 * @param string The user that the parent was shared with (optinal)
+	 */
+	public static function delete($parent, $excludeParent = false, $uidOwner = null) {
+		$ids = array($parent);
+		$parents = array($parent);
+		while (!empty($parents)) {
+			$parents = "'".implode("','", $parents)."'";
+			// Check the owner on the first search of reshares, useful for
+			// finding and deleting the reshares by a single user of a group share
+			if (count($ids) == 1 && isset($uidOwner)) {
+				$query = \OC_DB::prepare('SELECT `id`, `uid_owner`, `item_type`, `item_target`, `parent`'
+					.' FROM `*PREFIX*share` WHERE `parent` IN ('.$parents.') AND `uid_owner` = ?');
+				$result = $query->execute(array($uidOwner));
+			} else {
+				$query = \OC_DB::prepare('SELECT `id`, `item_type`, `item_target`, `parent`, `uid_owner`'
+					.' FROM `*PREFIX*share` WHERE `parent` IN ('.$parents.')');
+				$result = $query->execute();
+			}
+			// Reset parents array, only go through loop again if items are found
+			$parents = array();
+			while ($item = $result->fetchRow()) {
+				// Search for a duplicate parent share, this occurs when an
+				// item is shared to the same user through a group and user or the
+				// same item is shared by different users
+				$userAndGroups = array_merge(array($item['uid_owner']), \OC_Group::getUserGroups($item['uid_owner']));
+				$query = \OC_DB::prepare('SELECT `id`, `permissions` FROM `*PREFIX*share`'
+					.' WHERE `item_type` = ?'
+					.' AND `item_target` = ?'
+					.' AND `share_type` IN (?,?,?)'
+					.' AND `share_with` IN (\''.implode('\',\'', $userAndGroups).'\')'
+					.' AND `uid_owner` != ? AND `id` != ?');
+				$duplicateParent = $query->execute(array($item['item_type'], $item['item_target'],
+					self::SHARE_TYPE_USER, self::SHARE_TYPE_GROUP, self::$shareTypeGroupUserUnique,
+					$item['uid_owner'], $item['parent']))->fetchRow();
+				if ($duplicateParent) {
+					// Change the parent to the other item id if share permission is granted
+					if ($duplicateParent['permissions'] & \OCP\PERMISSION_SHARE) {
+						$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `parent` = ? WHERE `id` = ?');
+						$query->execute(array($duplicateParent['id'], $item['id']));
+						continue;
+					}
+				}
+				$ids[] = $item['id'];
+				$parents[] = $item['id'];
+			}
+		}
+		if ($excludeParent) {
+			unset($ids[0]);
+		}
+		if (!empty($ids)) {
+			$ids = "'".implode("','", $ids)."'";
+			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `id` IN ('.$ids.')');
+			$query->execute();
+		}
+	}
+}
diff --git a/lib/private/share/hooks.php b/lib/private/share/hooks.php
new file mode 100644
index 0000000000..a33c71eedd
--- /dev/null
+++ b/lib/private/share/hooks.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OC\Share;
+
+class Hooks extends \OC\Share\Constants {
+		/**
+	 * Function that is called after a user is deleted. Cleans up the shares of that user.
+	 * @param array arguments
+	 */
+	public static function post_deleteUser($arguments) {
+		// Delete any items shared with the deleted user
+		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share`'
+			.' WHERE `share_with` = ? AND `share_type` = ? OR `share_type` = ?');
+		$result = $query->execute(array($arguments['uid'], self::SHARE_TYPE_USER, self::$shareTypeGroupUserUnique));
+		// Delete any items the deleted user shared
+		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*share` WHERE `uid_owner` = ?');
+		$result = $query->execute(array($arguments['uid']));
+		while ($item = $result->fetchRow()) {
+			Helper::delete($item['id']);
+		}
+	}
+
+	/**
+	 * Function that is called after a user is added to a group.
+	 * TODO what does it do?
+	 * @param array arguments
+	 */
+	public static function post_addToGroup($arguments) {
+		// Find the group shares and check if the user needs a unique target
+		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?');
+		$result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid']));
+		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`,'
+			.' `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`,'
+			.' `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
+		while ($item = $result->fetchRow()) {
+			if ($item['item_type'] == 'file' || $item['item_type'] == 'file') {
+				$itemTarget = null;
+			} else {
+				$itemTarget = Helper::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
+						$arguments['uid'], $item['uid_owner'], $item['item_target'], $item['id']);
+			}
+			if (isset($item['file_source'])) {
+				$fileTarget = Helper::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
+					$arguments['uid'], $item['uid_owner'], $item['file_target'], $item['id']);
+			} else {
+				$fileTarget = null;
+			}
+			// Insert an extra row for the group share if the item or file target is unique for this user
+			if ($itemTarget != $item['item_target'] || $fileTarget != $item['file_target']) {
+				$query->execute(array($item['item_type'], $item['item_source'], $itemTarget, $item['id'],
+					self::$shareTypeGroupUserUnique, $arguments['uid'], $item['uid_owner'], $item['permissions'],
+					$item['stime'], $item['file_source'], $fileTarget));
+				\OC_DB::insertid('*PREFIX*share');
+			}
+		}
+	}
+
+	/**
+	 * Function that is called after a user is removed from a group. Shares are cleaned up.
+	 * @param array arguments
+	 */
+	public static function post_removeFromGroup($arguments) {
+		$sql = 'SELECT `id`, `share_type` FROM `*PREFIX*share`'
+			.' WHERE (`share_type` = ? AND `share_with` = ?) OR (`share_type` = ? AND `share_with` = ?)';
+		$result = \OC_DB::executeAudited($sql, array(self::SHARE_TYPE_GROUP, $arguments['gid'],
+			self::$shareTypeGroupUserUnique, $arguments['uid']));
+		while ($item = $result->fetchRow()) {
+			if ($item['share_type'] == self::SHARE_TYPE_GROUP) {
+				// Delete all reshares by this user of the group share
+				Helper::delete($item['id'], true, $arguments['uid']);
+			} else {
+				Helper::delete($item['id']);
+			}
+		}
+	}
+
+	/**
+	 * Function that is called after a group is removed. Cleans up the shares to that group.
+	 * @param array arguments
+	 */
+	public static function post_deleteGroup($arguments) {
+		$sql = 'SELECT `id` FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?';
+		$result = \OC_DB::executeAudited($sql, array(self::SHARE_TYPE_GROUP, $arguments['gid']));
+		while ($item = $result->fetchRow()) {
+			Helper::delete($item['id']);
+		}
+	}
+
+}
diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php
index afbf35aa39..4799db5233 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -96,7 +96,7 @@ class MailNotifications {
 			try {
 				\OCP\Util::sendMail($to, $recipientDisplayName, $subject, $htmlMail, $this->from, $this->senderDisplayName, 1, $alttextMail);
 			} catch (\Exception $e) {
-				\OCP\Util::writeLog('sharing', "Can't send mail to inform the user abaut an internal share: " . $e->getMessage() , \OCP\Util::ERROR);
+				\OCP\Util::writeLog('sharing', "Can't send mail to inform the user about an internal share: " . $e->getMessage() , \OCP\Util::ERROR);
 				$noMail[] = $recipientDisplayName;
 			}
 		}
@@ -108,23 +108,26 @@ class MailNotifications {
 	/**
 	 * @brief inform recipient about public link share
 	 *
-	 * @param string recipient recipient email address
+	 * @param string $recipient recipient email address
 	 * @param string $filename the shared file
 	 * @param string $link the public link
 	 * @param int $expiration expiration date (timestamp)
-	 * @return string|boolean $result true or error message
+	 * @return array $result of failed recipients
 	 */
 	public function sendLinkShareMail($recipient, $filename, $link, $expiration) {
 		$subject = (string)$this->l->t('%s shared »%s« with you', array($this->senderDisplayName, $filename));
 		list($htmlMail, $alttextMail) = $this->createMailBody($filename, $link, $expiration);
-		try {
-			\OCP\Util::sendMail($recipient, $recipient, $subject, $htmlMail, $this->from, $this->senderDisplayName, 1, $alttextMail);
-		} catch (\Exception $e) {
-			\OCP\Util::writeLog('sharing', "Can't send mail with public link: " . $e->getMessage(), \OCP\Util::ERROR);
-			return $e->getMessage();
+		$rs = explode(' ', $recipient);
+		$failed = array();
+		foreach ($rs as $r) {
+			try {
+				\OCP\Util::sendMail($r, $r, $subject, $htmlMail, $this->from, $this->senderDisplayName, 1, $alttextMail);
+			} catch (\Exception $e) {
+				\OCP\Util::writeLog('sharing', "Can't send mail with public link to $r: " . $e->getMessage(), \OCP\Util::ERROR);
+				$failed[] = $r;
+			}
 		}
-
-		return true;
+		return $failed;
 	}
 
 	/**
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
new file mode 100644
index 0000000000..8238797600
--- /dev/null
+++ b/lib/private/share/share.php
@@ -0,0 +1,1619 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle, Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski <mtgap@owncloud.com>
+ *            2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OC\Share;
+
+/**
+ * This class provides the ability for apps to share their content between users.
+ * Apps must create a backend class that implements OCP\Share_Backend and register it with this class.
+ *
+ * It provides the following hooks:
+ *  - post_shared
+ */
+class Share extends \OC\Share\Constants {
+
+	/** CRUDS permissions (Create, Read, Update, Delete, Share) using a bitmask
+	 * Construct permissions for share() and setPermissions with Or (|) e.g.
+	 * Give user read and update permissions: PERMISSION_READ | PERMISSION_UPDATE
+	 *
+	 * Check if permission is granted with And (&) e.g. Check if delete is
+	 * granted: if ($permissions & PERMISSION_DELETE)
+	 *
+	 * Remove permissions with And (&) and Not (~) e.g. Remove the update
+	 * permission: $permissions &= ~PERMISSION_UPDATE
+	 *
+	 * Apps are required to handle permissions on their own, this class only
+	 * stores and manages the permissions of shares
+	 * @see lib/public/constants.php
+	 */
+
+	/**
+	 * Register a sharing backend class that implements OCP\Share_Backend for an item type
+	 * @param string Item type
+	 * @param string Backend class
+	 * @param string (optional) Depends on item type
+	 * @param array (optional) List of supported file extensions if this item type depends on files
+	 * @return Returns true if backend is registered or false if error
+	 */
+	public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
+		if (self::isEnabled()) {
+			if (!isset(self::$backendTypes[$itemType])) {
+				self::$backendTypes[$itemType] = array(
+					'class' => $class,
+					'collectionOf' => $collectionOf,
+					'supportedFileExtensions' => $supportedFileExtensions
+				);
+				if(count(self::$backendTypes) === 1) {
+					\OC_Util::addScript('core', 'share');
+					\OC_Util::addStyle('core', 'share');
+				}
+				return true;
+			}
+			\OC_Log::write('OCP\Share',
+				'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class']
+				.' is already registered for '.$itemType,
+				\OC_Log::WARN);
+		}
+		return false;
+	}
+
+	/**
+	 * Check if the Share API is enabled
+	 * @return Returns true if enabled or false
+	 *
+	 * The Share API is enabled by default if not configured
+	 */
+	public static function isEnabled() {
+		if (\OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes') == 'yes') {
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Find which users can access a shared item
+	 * @param $path to the file
+	 * @param $user owner of the file
+	 * @param include owner to the list of users with access to the file
+	 * @return array
+	 * @note $path needs to be relative to user data dir, e.g. 'file.txt'
+	 *       not '/admin/data/file.txt'
+	 */
+	public static function getUsersSharingFile($path, $user, $includeOwner = false) {
+
+		$shares = array();
+		$publicShare = false;
+		$source = -1;
+		$cache = false;
+
+		$view = new \OC\Files\View('/' . $user . '/files');
+		if ($view->file_exists($path)) {
+			$meta = $view->getFileInfo($path);
+		} else {
+			// if the file doesn't exists yet we start with the parent folder
+			$meta = $view->getFileInfo(dirname($path));
+		}
+
+		if($meta !== false) {
+			$source = $meta['fileid'];
+			$cache = new \OC\Files\Cache\Cache($meta['storage']);
+		}
+
+		while ($source !== -1) {
+
+			// Fetch all shares with another user
+			$query = \OC_DB::prepare(
+				'SELECT `share_with`
+				FROM
+				`*PREFIX*share`
+				WHERE
+				`item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
+			);
+
+			$result = $query->execute(array($source, self::SHARE_TYPE_USER));
+
+			if (\OCP\DB::isError($result)) {
+				\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+			} else {
+				while ($row = $result->fetchRow()) {
+					$shares[] = $row['share_with'];
+				}
+			}
+			// We also need to take group shares into account
+
+			$query = \OC_DB::prepare(
+				'SELECT `share_with`
+				FROM
+				`*PREFIX*share`
+				WHERE
+				`item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
+			);
+
+			$result = $query->execute(array($source, self::SHARE_TYPE_GROUP));
+
+			if (\OCP\DB::isError($result)) {
+				\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+			} else {
+				while ($row = $result->fetchRow()) {
+					$usersInGroup = \OC_Group::usersInGroup($row['share_with']);
+					$shares = array_merge($shares, $usersInGroup);
+				}
+			}
+
+			//check for public link shares
+			if (!$publicShare) {
+				$query = \OC_DB::prepare(
+					'SELECT `share_with`
+					FROM
+					`*PREFIX*share`
+					WHERE
+					`item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
+				);
+
+				$result = $query->execute(array($source, self::SHARE_TYPE_LINK));
+
+				if (\OCP\DB::isError($result)) {
+					\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
+				} else {
+					if ($result->fetchRow()) {
+						$publicShare = true;
+					}
+				}
+			}
+
+			// let's get the parent for the next round
+			$meta = $cache->get((int)$source);
+			if($meta !== false) {
+				$source = (int)$meta['parent'];
+			} else {
+				$source = -1;
+			}
+		}
+		// Include owner in list of users, if requested
+		if ($includeOwner) {
+			$shares[] = $user;
+		}
+
+		return array("users" => array_unique($shares), "public" => $publicShare);
+	}
+
+	/**
+	 * Get the items of item type shared with the current user
+	 * @param string Item type
+	 * @param int Format (optional) Format type must be defined by the backend
+	 * @param mixed Parameters (optional)
+	 * @param int Number of items to return (optional) Returns all by default
+	 * @param bool include collections (optional)
+	 * @return Return depends on format
+	 */
+	public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE,
+		$parameters = null, $limit = -1, $includeCollections = false) {
+		return self::getItems($itemType, null, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format,
+			$parameters, $limit, $includeCollections);
+	}
+
+	/**
+	 * Get the item of item type shared with the current user
+	 * @param string $itemType
+	 * @param string $itemTarget
+	 * @param int $format (optional) Format type must be defined by the backend
+	 * @param mixed Parameters (optional)
+	 * @param bool include collections (optional)
+	 * @return Return depends on format
+	 */
+	public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE,
+		$parameters = null, $includeCollections = false) {
+		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format,
+			$parameters, 1, $includeCollections);
+	}
+
+	/**
+	 * Get the item of item type shared with a given user by source
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param string $user User user to whom the item was shared
+	 * @return array Return list of items with file_target, permissions and expiration
+	 */
+	public static function getItemSharedWithUser($itemType, $itemSource, $user) {
+
+		$shares = array();
+
+		// first check if there is a db entry for the specific user
+		$query = \OC_DB::prepare(
+				'SELECT `file_target`, `permissions`, `expiration`
+					FROM
+					`*PREFIX*share`
+					WHERE
+					`item_source` = ? AND `item_type` = ? AND `share_with` = ?'
+				);
+
+		$result = \OC_DB::executeAudited($query, array($itemSource, $itemType, $user));
+
+		while ($row = $result->fetchRow()) {
+			$shares[] = $row;
+		}
+
+		//if didn't found a result than let's look for a group share.
+		if(empty($shares)) {
+			$groups = \OC_Group::getUserGroups($user);
+
+			$query = \OC_DB::prepare(
+					'SELECT `file_target`, `permissions`, `expiration`
+						FROM
+						`*PREFIX*share`
+						WHERE
+						`item_source` = ? AND `item_type` = ? AND `share_with` in (?)'
+					);
+
+			$result = \OC_DB::executeAudited($query, array($itemSource, $itemType, implode(',', $groups)));
+
+			while ($row = $result->fetchRow()) {
+				$shares[] = $row;
+			}
+		}
+
+		return $shares;
+
+	}
+
+	/**
+	 * Get the item of item type shared with the current user by source
+	 * @param string Item type
+	 * @param string Item source
+	 * @param int Format (optional) Format type must be defined by the backend
+	 * @param mixed Parameters
+	 * @param bool include collections
+	 * @return Return depends on format
+	 */
+	public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
+		$parameters = null, $includeCollections = false) {
+		return self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format,
+			$parameters, 1, $includeCollections, true);
+	}
+
+	/**
+	 * Get the item of item type shared by a link
+	 * @param string Item type
+	 * @param string Item source
+	 * @param string Owner of link
+	 * @return Item
+	 */
+	public static function getItemSharedWithByLink($itemType, $itemSource, $uidOwner) {
+		return self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE,
+			null, 1);
+	}
+
+	/**
+	 * Based on the given token the share information will be returned - password protected shares will be verified
+	 * @param string $token
+	 * @return array | bool false will be returned in case the token is unknown or unauthorized
+	 */
+	public static function getShareByToken($token, $checkPasswordProtection = true) {
+		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1);
+		$result = $query->execute(array($token));
+		if (\OC_DB::isError($result)) {
+			\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', token=' . $token, \OC_Log::ERROR);
+		}
+		$row = $result->fetchRow();
+		if ($row === false) {
+			return false;
+		}
+		if (is_array($row) and self::expireItem($row)) {
+			return false;
+		}
+
+		// password protected shares need to be authenticated
+		if ($checkPasswordProtection && !\OCP\Share::checkPasswordProtectedShare($row)) {
+			return false;
+		}
+
+		return $row;
+	}
+
+	/**
+	 * resolves reshares down to the last real share
+	 * @param $linkItem
+	 * @return $fileOwner
+	 */
+	public static function resolveReShare($linkItem)
+	{
+		if (isset($linkItem['parent'])) {
+			$parent = $linkItem['parent'];
+			while (isset($parent)) {
+				$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `id` = ?', 1);
+				$item = $query->execute(array($parent))->fetchRow();
+				if (isset($item['parent'])) {
+					$parent = $item['parent'];
+				} else {
+					return $item;
+				}
+			}
+		}
+		return $linkItem;
+	}
+
+
+	/**
+	 * Get the shared items of item type owned by the current user
+	 * @param string Item type
+	 * @param int Format (optional) Format type must be defined by the backend
+	 * @param mixed Parameters
+	 * @param int Number of items to return (optional) Returns all by default
+	 * @param bool include collections
+	 * @return Return depends on format
+	 */
+	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null,
+		$limit = -1, $includeCollections = false) {
+		return self::getItems($itemType, null, null, null, \OC_User::getUser(), $format,
+			$parameters, $limit, $includeCollections);
+	}
+
+	/**
+	 * Get the shared item of item type owned by the current user
+	 * @param string Item type
+	 * @param string Item source
+	 * @param int Format (optional) Format type must be defined by the backend
+	 * @param mixed Parameters
+	 * @param bool include collections
+	 * @return Return depends on format
+	 */
+	public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE,
+	                                     $parameters = null, $includeCollections = false) {
+		return self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), $format,
+			$parameters, -1, $includeCollections);
+	}
+
+	/**
+	 * Get all users an item is shared with
+	 * @param string Item type
+	 * @param string Item source
+	 * @param string Owner
+	 * @param bool Include collections
+	 * @praram bool check expire date
+	 * @return Return array of users
+	 */
+	public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false, $checkExpireDate = true) {
+
+		$users = array();
+		$items = self::getItems($itemType, $itemSource, null, null, $uidOwner, self::FORMAT_NONE, null, -1, $includeCollections, false, $checkExpireDate);
+		if ($items) {
+			foreach ($items as $item) {
+				if ((int)$item['share_type'] === self::SHARE_TYPE_USER) {
+					$users[] = $item['share_with'];
+				} else if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) {
+					$users = array_merge($users, \OC_Group::usersInGroup($item['share_with']));
+				}
+			}
+		}
+		return $users;
+	}
+
+	/**
+	 * Share an item with a user, group, or via private link
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+	 * @param string $shareWith User or group the item is being shared with
+	 * @param int $permissions CRUDS
+	 * @param null $itemSourceName
+	 * @throws \Exception
+	 * @internal param \OCP\Item $string type
+	 * @internal param \OCP\Item $string source
+	 * @internal param \OCP\SHARE_TYPE_USER $int , SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+	 * @internal param \OCP\User $string or group the item is being shared with
+	 * @internal param \OCP\CRUDS $int permissions
+	 * @return bool|string Returns true on success or false on failure, Returns token on success for links
+	 */
+	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null) {
+		$uidOwner = \OC_User::getUser();
+		$sharingPolicy = \OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global');
+
+		if (is_null($itemSourceName)) {
+			$itemSourceName = $itemSource;
+		}
+
+		// Verify share type and sharing conditions are met
+		if ($shareType === self::SHARE_TYPE_USER) {
+			if ($shareWith == $uidOwner) {
+				$message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' is the item owner';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+			if (!\OC_User::userExists($shareWith)) {
+				$message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' does not exist';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+			if ($sharingPolicy == 'groups_only') {
+				$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
+				if (empty($inGroup)) {
+					$message = 'Sharing '.$itemSourceName.' failed, because the user '
+						.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				}
+			}
+			// Check if the item source is already shared with the user, either from the same owner or a different user
+			if ($checkExists = self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups,
+				$shareWith, null, self::FORMAT_NONE, null, 1, true, true)) {
+				// Only allow the same share to occur again if it is the same
+				// owner and is not a user share, this use case is for increasing
+				// permissions for a specific user
+				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
+					$message = 'Sharing '.$itemSourceName.' failed, because this item is already shared with '.$shareWith;
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				}
+			}
+		} else if ($shareType === self::SHARE_TYPE_GROUP) {
+			if (!\OC_Group::groupExists($shareWith)) {
+				$message = 'Sharing '.$itemSourceName.' failed, because the group '.$shareWith.' does not exist';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+			if ($sharingPolicy == 'groups_only' && !\OC_Group::inGroup($uidOwner, $shareWith)) {
+				$message = 'Sharing '.$itemSourceName.' failed, because '
+					.$uidOwner.' is not a member of the group '.$shareWith;
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+			// Check if the item source is already shared with the group, either from the same owner or a different user
+			// The check for each user in the group is done inside the put() function
+			if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_GROUP, $shareWith,
+				null, self::FORMAT_NONE, null, 1, true, true)) {
+				// Only allow the same share to occur again if it is the same
+				// owner and is not a group share, this use case is for increasing
+				// permissions for a specific user
+				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
+					$message = 'Sharing '.$itemSourceName.' failed, because this item is already shared with '.$shareWith;
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				}
+			}
+			// Convert share with into an array with the keys group and users
+			$group = $shareWith;
+			$shareWith = array();
+			$shareWith['group'] = $group;
+			$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
+		} else if ($shareType === self::SHARE_TYPE_LINK) {
+			if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') {
+				// when updating a link share
+				if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null,
+					$uidOwner, self::FORMAT_NONE, null, 1)) {
+					// remember old token
+					$oldToken = $checkExists['token'];
+					$oldPermissions = $checkExists['permissions'];
+					//delete the old share
+					Helper::delete($checkExists['id']);
+				}
+
+				// Generate hash of password - same method as user passwords
+				if (isset($shareWith)) {
+					$forcePortable = (CRYPT_BLOWFISH != 1);
+					$hasher = new \PasswordHash(8, $forcePortable);
+					$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
+				} else {
+					// reuse the already set password, but only if we change permissions
+					// otherwise the user disabled the password protection
+					if ($checkExists && (int)$permissions !== (int)$oldPermissions) {
+						$shareWith = $checkExists['share_with'];
+					}
+				}
+
+				// Generate token
+				if (isset($oldToken)) {
+					$token = $oldToken;
+				} else {
+					$token = \OC_Util::generateRandomBytes(self::TOKEN_LENGTH);
+				}
+				$result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions,
+					null, $token, $itemSourceName);
+				if ($result) {
+					return $token;
+				} else {
+					return false;
+				}
+			}
+			$message = 'Sharing '.$itemSourceName.' failed, because sharing with links is not allowed';
+			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+			throw new \Exception($message);
+			return false;
+		} else {
+			// Future share types need to include their own conditions
+			$message = 'Share type '.$shareType.' is not valid for '.$itemSource;
+			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+			throw new \Exception($message);
+		}
+			// Put the item into the database
+			return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, null, $itemSourceName);
+	}
+
+	/**
+	 * Unshare an item from a user, group, or delete a private link
+	 * @param string Item type
+	 * @param string Item source
+	 * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+	 * @param string User or group the item is being shared with
+	 * @return Returns true on success or false on failure
+	 */
+	public static function unshare($itemType, $itemSource, $shareType, $shareWith) {
+		$item = self::getItems($itemType, $itemSource, $shareType, $shareWith, \OC_User::getUser(),self::FORMAT_NONE, null, 1);
+		if (!empty($item)) {
+			self::unshareItem($item);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Unshare an item from all users, groups, and remove all links
+	 * @param string Item type
+	 * @param string Item source
+	 * @return Returns true on success or false on failure
+	 */
+	public static function unshareAll($itemType, $itemSource) {
+		// Get all of the owners of shares of this item.
+		$query = \OC_DB::prepare( 'SELECT `uid_owner` from `*PREFIX*share` WHERE `item_type`=? AND `item_source`=?' );
+		$result = $query->execute(array($itemType, $itemSource));
+		$shares = array();
+		// Add each owner's shares to the array of all shares for this item.
+		while ($row = $result->fetchRow()) {
+			$shares = array_merge($shares, self::getItems($itemType, $itemSource, null, null, $row['uid_owner']));
+		}
+		if (!empty($shares)) {
+			// Pass all the vars we have for now, they may be useful
+			$hookParams = array(
+				'itemType' => $itemType,
+				'itemSource' => $itemSource,
+				'shares' => $shares,
+			);
+			\OC_Hook::emit('OCP\Share', 'pre_unshareAll', $hookParams);
+			foreach ($shares as $share) {
+				self::unshareItem($share);
+			}
+			\OC_Hook::emit('OCP\Share', 'post_unshareAll', $hookParams);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Unshare an item shared with the current user
+	 * @param string Item type
+	 * @param string Item target
+	 * @return Returns true on success or false on failure
+	 *
+	 * Unsharing from self is not allowed for items inside collections
+	 */
+	public static function unshareFromSelf($itemType, $itemTarget) {
+		$item = self::getItemSharedWith($itemType, $itemTarget);
+		if (!empty($item)) {
+			if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) {
+				// Insert an extra row for the group share and set permission
+				// to 0 to prevent it from showing up for the user
+				$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share`'
+					.' (`item_type`, `item_source`, `item_target`, `parent`, `share_type`,'
+					.' `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`)'
+					.' VALUES (?,?,?,?,?,?,?,?,?,?,?)');
+				$query->execute(array($item['item_type'], $item['item_source'], $item['item_target'],
+					$item['id'], self::$shareTypeGroupUserUnique,
+					\OC_User::getUser(), $item['uid_owner'], 0, $item['stime'], $item['file_source'],
+					$item['file_target']));
+				\OC_DB::insertid('*PREFIX*share');
+				// Delete all reshares by this user of the group share
+				Helper::delete($item['id'], true, \OC_User::getUser());
+			} else if ((int)$item['share_type'] === self::$shareTypeGroupUserUnique) {
+				// Set permission to 0 to prevent it from showing up for the user
+				$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
+				$query->execute(array(0, $item['id']));
+				Helper::delete($item['id'], true);
+			} else {
+				Helper::delete($item['id']);
+			}
+			return true;
+		}
+		return false;
+	}
+	/**
+	 * sent status if users got informed by mail about share
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+	 * @param bool $status
+	 */
+	public static function setSendMailStatus($itemType, $itemSource, $shareType, $status) {
+		$status = $status ? 1 : 0;
+
+		$query = \OC_DB::prepare(
+				'UPDATE `*PREFIX*share`
+					SET `mail_send` = ?
+					WHERE `item_type` = ? AND `item_source` = ? AND `share_type` = ?');
+
+		$result = $query->execute(array($status, $itemType, $itemSource, $shareType));
+
+		if($result === false) {
+			\OC_Log::write('OCP\Share', 'Couldn\'t set send mail status', \OC_Log::ERROR);
+		}
+	}
+
+	/**
+	 * Set the permissions of an item for a specific user or group
+	 * @param string Item type
+	 * @param string Item source
+	 * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+	 * @param string User or group the item is being shared with
+	 * @param int CRUDS permissions
+	 * @return Returns true on success or false on failure
+	 */
+	public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) {
+		if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith,
+			\OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
+			// Check if this item is a reshare and verify that the permissions
+			// granted don't exceed the parent shared item
+			if (isset($item['parent'])) {
+				$query = \OC_DB::prepare('SELECT `permissions` FROM `*PREFIX*share` WHERE `id` = ?', 1);
+				$result = $query->execute(array($item['parent']))->fetchRow();
+				if (~(int)$result['permissions'] & $permissions) {
+					$message = 'Setting permissions for '.$itemSource.' failed,'
+						.' because the permissions exceed permissions granted to '.\OC_User::getUser();
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				}
+			}
+			$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
+			$query->execute(array($permissions, $item['id']));
+			if ($itemType === 'file' || $itemType === 'folder') {
+				\OC_Hook::emit('OCP\Share', 'post_update_permissions', array(
+					'itemType' => $itemType,
+					'itemSource' => $itemSource,
+					'shareType' => $shareType,
+					'shareWith' => $shareWith,
+					'uidOwner' => \OC_User::getUser(),
+					'permissions' => $permissions,
+					'path' => $item['path'],
+				));
+			}
+			// Check if permissions were removed
+			if ($item['permissions'] & ~$permissions) {
+				// If share permission is removed all reshares must be deleted
+				if (($item['permissions'] & \OCP\PERMISSION_SHARE) && (~$permissions & \OCP\PERMISSION_SHARE)) {
+					Helper::delete($item['id'], true);
+				} else {
+					$ids = array();
+					$parents = array($item['id']);
+					while (!empty($parents)) {
+						$parents = "'".implode("','", $parents)."'";
+						$query = \OC_DB::prepare('SELECT `id`, `permissions` FROM `*PREFIX*share`'
+							.' WHERE `parent` IN ('.$parents.')');
+						$result = $query->execute();
+						// Reset parents array, only go through loop again if
+						// items are found that need permissions removed
+						$parents = array();
+						while ($item = $result->fetchRow()) {
+							// Check if permissions need to be removed
+							if ($item['permissions'] & ~$permissions) {
+								// Add to list of items that need permissions removed
+								$ids[] = $item['id'];
+								$parents[] = $item['id'];
+							}
+						}
+					}
+					// Remove the permissions for all reshares of this item
+					if (!empty($ids)) {
+						$ids = "'".implode("','", $ids)."'";
+						// TODO this should be done with Doctrine platform objects
+						if (\OC_Config::getValue( "dbtype") === 'oci') {
+							$andOp = 'BITAND(`permissions`, ?)';
+						} else {
+							$andOp = '`permissions` & ?';
+						}
+						$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = '.$andOp
+							.' WHERE `id` IN ('.$ids.')');
+						$query->execute(array($permissions));
+					}
+				}
+			}
+			return true;
+		}
+		$message = 'Setting permissions for '.$itemSource.' failed, because the item was not found';
+		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+		throw new \Exception($message);
+	}
+
+	/**
+	 * Set expiration date for a share
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param string $date expiration date
+	 * @return \OCP\Share_Backend
+	 */
+	public static function setExpirationDate($itemType, $itemSource, $date) {
+		$user = \OC_User::getUser();
+		$items = self::getItems($itemType, $itemSource, null, null, $user, self::FORMAT_NONE, null, -1, false);
+		if (!empty($items)) {
+			if ($date == '') {
+				$date = null;
+			} else {
+				$date = new \DateTime($date);
+			}
+			$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `expiration` = ? WHERE `id` = ?');
+			$query->bindValue(1, $date, 'datetime');
+			foreach ($items as $item) {
+				$query->bindValue(2, (int) $item['id']);
+				$query->execute();
+				\OC_Hook::emit('OCP\Share', 'post_set_expiration_date', array(
+					'itemType' => $itemType,
+					'itemSource' => $itemSource,
+					'date' => $date,
+					'uidOwner' => $user
+				));
+			}
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Checks whether a share has expired, calls unshareItem() if yes.
+	 * @param array $item Share data (usually database row)
+	 * @return bool True if item was expired, false otherwise.
+	 */
+	protected static function expireItem(array $item) {
+		if (!empty($item['expiration'])) {
+			$now = new \DateTime();
+			$expires = new \DateTime($item['expiration']);
+			if ($now > $expires) {
+				self::unshareItem($item);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Unshares a share given a share data array
+	 * @param array $item Share data (usually database row)
+	 * @return null
+	 */
+	protected static function unshareItem(array $item) {
+		// Pass all the vars we have for now, they may be useful
+		$hookParams = array(
+			'itemType'      => $item['item_type'],
+			'itemSource'    => $item['item_source'],
+			'shareType'     => $item['share_type'],
+			'shareWith'     => $item['share_with'],
+			'itemParent'    => $item['parent'],
+			'uidOwner'      => $item['uid_owner'],
+		);
+
+		\OC_Hook::emit('OCP\Share', 'pre_unshare', $hookParams + array(
+			'fileSource'	=> $item['file_source'],
+		));
+		Helper::delete($item['id']);
+		\OC_Hook::emit('OCP\Share', 'post_unshare', $hookParams);
+	}
+
+	/**
+	 * Get the backend class for the specified item type
+	 * @param string $itemType
+	 * @return \OCP\Share_Backend
+	 */
+	public static function getBackend($itemType) {
+		if (isset(self::$backends[$itemType])) {
+			return self::$backends[$itemType];
+		} else if (isset(self::$backendTypes[$itemType]['class'])) {
+			$class = self::$backendTypes[$itemType]['class'];
+			if (class_exists($class)) {
+				self::$backends[$itemType] = new $class;
+				if (!(self::$backends[$itemType] instanceof \OCP\Share_Backend)) {
+					$message = 'Sharing backend '.$class.' must implement the interface OCP\Share_Backend';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				}
+				return self::$backends[$itemType];
+			} else {
+				$message = 'Sharing backend '.$class.' not found';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+		}
+		$message = 'Sharing backend for '.$itemType.' not found';
+		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+		throw new \Exception($message);
+	}
+
+	/**
+	 * Check if resharing is allowed
+	 * @return Returns true if allowed or false
+	 *
+	 * Resharing is allowed by default if not configured
+	 */
+	private static function isResharingAllowed() {
+		if (!isset(self::$isResharingAllowed)) {
+			if (\OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes') == 'yes') {
+				self::$isResharingAllowed = true;
+			} else {
+				self::$isResharingAllowed = false;
+			}
+		}
+		return self::$isResharingAllowed;
+	}
+
+	/**
+	 * Get a list of collection item types for the specified item type
+	 * @param string Item type
+	 * @return array
+	 */
+	private static function getCollectionItemTypes($itemType) {
+		$collectionTypes = array($itemType);
+		foreach (self::$backendTypes as $type => $backend) {
+			if (in_array($backend['collectionOf'], $collectionTypes)) {
+				$collectionTypes[] = $type;
+			}
+		}
+		// TODO Add option for collections to be collection of themselves, only 'folder' does it now...
+		if (!self::getBackend($itemType) instanceof \OCP\Share_Backend_Collection || $itemType != 'folder') {
+			unset($collectionTypes[0]);
+		}
+		// Return array if collections were found or the item type is a
+		// collection itself - collections can be inside collections
+		if (count($collectionTypes) > 0) {
+			return $collectionTypes;
+		}
+		return false;
+	}
+
+	/**
+	 * Get shared items from the database
+	 * @param string Item type
+	 * @param string Item source or target (optional)
+	 * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
+	 * @param string User or group the item is being shared with
+	 * @param string User that is the owner of shared items (optional)
+	 * @param int Format to convert items to with formatItems()
+	 * @param mixed Parameters to pass to formatItems()
+	 * @param int Number of items to return, -1 to return all matches (optional)
+	 * @param bool Include collection item types (optional)
+	 * @param bool TODO (optional)
+	 * @prams bool check expire date
+	 * @return array
+	 *
+	 * See public functions getItem(s)... for parameter usage
+	 *
+	 */
+	public static function getItems($itemType, $item = null, $shareType = null, $shareWith = null,
+		$uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1,
+		$includeCollections = false, $itemShareWithBySource = false, $checkExpireDate  = true) {
+		if (!self::isEnabled()) {
+			return array();
+		}
+		$backend = self::getBackend($itemType);
+		$collectionTypes = false;
+		// Get filesystem root to add it to the file target and remove from the
+		// file source, match file_source with the file cache
+		if ($itemType == 'file' || $itemType == 'folder') {
+			if(!is_null($uidOwner)) {
+				$root = \OC\Files\Filesystem::getRoot();
+			} else {
+				$root = '';
+			}
+			$where = 'INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid`';
+			if (!isset($item)) {
+				$where .= ' WHERE `file_target` IS NOT NULL';
+			}
+			$fileDependent = true;
+			$queryArgs = array();
+		} else {
+			$fileDependent = false;
+			$root = '';
+			$collectionTypes = self::getCollectionItemTypes($itemType);
+			if ($includeCollections && !isset($item) && $collectionTypes) {
+				// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
+				if (!in_array($itemType, $collectionTypes)) {
+					$itemTypes = array_merge(array($itemType), $collectionTypes);
+				} else {
+					$itemTypes = $collectionTypes;
+				}
+				$placeholders = join(',', array_fill(0, count($itemTypes), '?'));
+				$where = ' WHERE `item_type` IN ('.$placeholders.'))';
+				$queryArgs = $itemTypes;
+			} else {
+				$where = ' WHERE `item_type` = ?';
+				$queryArgs = array($itemType);
+			}
+		}
+		if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+			$where .= ' AND `share_type` != ?';
+			$queryArgs[] = self::SHARE_TYPE_LINK;
+		}
+		if (isset($shareType)) {
+			// Include all user and group items
+			if ($shareType == self::$shareTypeUserAndGroups && isset($shareWith)) {
+				$where .= ' AND `share_type` IN (?,?,?)';
+				$queryArgs[] = self::SHARE_TYPE_USER;
+				$queryArgs[] = self::SHARE_TYPE_GROUP;
+				$queryArgs[] = self::$shareTypeGroupUserUnique;
+				$userAndGroups = array_merge(array($shareWith), \OC_Group::getUserGroups($shareWith));
+				$placeholders = join(',', array_fill(0, count($userAndGroups), '?'));
+				$where .= ' AND `share_with` IN ('.$placeholders.')';
+				$queryArgs = array_merge($queryArgs, $userAndGroups);
+				// Don't include own group shares
+				$where .= ' AND `uid_owner` != ?';
+				$queryArgs[] = $shareWith;
+			} else {
+				$where .= ' AND `share_type` = ?';
+				$queryArgs[] = $shareType;
+				if (isset($shareWith)) {
+					$where .= ' AND `share_with` = ?';
+					$queryArgs[] = $shareWith;
+				}
+			}
+		}
+		if (isset($uidOwner)) {
+			$where .= ' AND `uid_owner` = ?';
+			$queryArgs[] = $uidOwner;
+			if (!isset($shareType)) {
+				// Prevent unique user targets for group shares from being selected
+				$where .= ' AND `share_type` != ?';
+				$queryArgs[] = self::$shareTypeGroupUserUnique;
+			}
+			if ($fileDependent) {
+				$column = 'file_source';
+			} else {
+				$column = 'item_source';
+			}
+		} else {
+			if ($fileDependent) {
+				$column = 'file_target';
+			} else {
+				$column = 'item_target';
+			}
+		}
+		if (isset($item)) {
+			$collectionTypes = self::getCollectionItemTypes($itemType);
+			if ($includeCollections && $collectionTypes) {
+				$where .= ' AND (';
+			} else {
+				$where .= ' AND';
+			}
+			// If looking for own shared items, check item_source else check item_target
+			if (isset($uidOwner) || $itemShareWithBySource) {
+				// If item type is a file, file source needs to be checked in case the item was converted
+				if ($fileDependent) {
+					$where .= ' `file_source` = ?';
+					$column = 'file_source';
+				} else {
+					$where .= ' `item_source` = ?';
+					$column = 'item_source';
+				}
+			} else {
+				if ($fileDependent) {
+					$where .= ' `file_target` = ?';
+					$item = \OC\Files\Filesystem::normalizePath($item);
+				} else {
+					$where .= ' `item_target` = ?';
+				}
+			}
+			$queryArgs[] = $item;
+			if ($includeCollections && $collectionTypes) {
+				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
+				$where .= ' OR `item_type` IN ('.$placeholders.'))';
+				$queryArgs = array_merge($queryArgs, $collectionTypes);
+			}
+		}
+		if ($limit != -1 && !$includeCollections) {
+			if ($shareType == self::$shareTypeUserAndGroups) {
+				// Make sure the unique user target is returned if it exists,
+				// unique targets should follow the group share in the database
+				// If the limit is not 1, the filtering can be done later
+				$where .= ' ORDER BY `*PREFIX*share`.`id` DESC';
+			}
+			// The limit must be at least 3, because filtering needs to be done
+			if ($limit < 3) {
+				$queryLimit = 3;
+			} else {
+				$queryLimit = $limit;
+			}
+		} else {
+			$queryLimit = null;
+		}
+		$select = self::createSelectStatement($format, $fileDependent, $uidOwner);
+		$root = strlen($root);
+		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
+		$result = $query->execute($queryArgs);
+		if (\OC_DB::isError($result)) {
+			\OC_Log::write('OCP\Share',
+				\OC_DB::getErrorMessage($result) . ', select=' . $select . ' where=' . $where,
+				\OC_Log::ERROR);
+		}
+		$items = array();
+		$targets = array();
+		$switchedItems = array();
+		$mounts = array();
+		while ($row = $result->fetchRow()) {
+			self::transformDBResults($row);
+			// Filter out duplicate group shares for users with unique targets
+			if ($row['share_type'] == self::$shareTypeGroupUserUnique && isset($items[$row['parent']])) {
+				$row['share_type'] = self::SHARE_TYPE_GROUP;
+				$row['share_with'] = $items[$row['parent']]['share_with'];
+				// Remove the parent group share
+				unset($items[$row['parent']]);
+				if ($row['permissions'] == 0) {
+					continue;
+				}
+			} else if (!isset($uidOwner)) {
+				// Check if the same target already exists
+				if (isset($targets[$row[$column]])) {
+					// Check if the same owner shared with the user twice
+					// through a group and user share - this is allowed
+					$id = $targets[$row[$column]];
+					if (isset($items[$id]) && $items[$id]['uid_owner'] == $row['uid_owner']) {
+						// Switch to group share type to ensure resharing conditions aren't bypassed
+						if ($items[$id]['share_type'] != self::SHARE_TYPE_GROUP) {
+							$items[$id]['share_type'] = self::SHARE_TYPE_GROUP;
+							$items[$id]['share_with'] = $row['share_with'];
+						}
+						// Switch ids if sharing permission is granted on only
+						// one share to ensure correct parent is used if resharing
+						if (~(int)$items[$id]['permissions'] & \OCP\PERMISSION_SHARE
+							&& (int)$row['permissions'] & \OCP\PERMISSION_SHARE) {
+							$items[$row['id']] = $items[$id];
+							$switchedItems[$id] = $row['id'];
+							unset($items[$id]);
+							$id = $row['id'];
+						}
+						// Combine the permissions for the item
+						$items[$id]['permissions'] |= (int)$row['permissions'];
+						continue;
+					}
+				} else {
+					$targets[$row[$column]] = $row['id'];
+				}
+			}
+			// Remove root from file source paths if retrieving own shared items
+			if (isset($uidOwner) && isset($row['path'])) {
+				if (isset($row['parent'])) {
+					// FIXME: Doesn't always construct the correct path, example:
+					// Folder '/a/b', share '/a' and '/a/b' to user2
+					// user2 reshares /Shared/b and ask for share status of /Shared/a/b
+					// expected result: path=/Shared/a/b; actual result /Shared/b because of the parent
+					$query = \OC_DB::prepare('SELECT `file_target` FROM `*PREFIX*share` WHERE `id` = ?');
+					$parentResult = $query->execute(array($row['parent']));
+					if (\OC_DB::isError($result)) {
+						\OC_Log::write('OCP\Share', 'Can\'t select parent: ' .
+								\OC_DB::getErrorMessage($result) . ', select=' . $select . ' where=' . $where,
+								\OC_Log::ERROR);
+					} else {
+						$parentRow = $parentResult->fetchRow();
+						$tmpPath = '/Shared' . $parentRow['file_target'];
+						// find the right position where the row path continues from the target path
+						$pos = strrpos($row['path'], $parentRow['file_target']);
+						$subPath = substr($row['path'], $pos);
+						$splitPath = explode('/', $subPath);
+						foreach (array_slice($splitPath, 2) as $pathPart) {
+							$tmpPath = $tmpPath . '/' . $pathPart;
+						}
+						$row['path'] = $tmpPath;
+					}
+				} else {
+					if (!isset($mounts[$row['storage']])) {
+						$mountPoints = \OC\Files\Filesystem::getMountByNumericId($row['storage']);
+						if (is_array($mountPoints)) {
+							$mounts[$row['storage']] = current($mountPoints);
+						}
+					}
+					if ($mounts[$row['storage']]) {
+						$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
+						$row['path'] = substr($path, $root);
+					}
+				}
+			}
+			if($checkExpireDate) {
+				if (self::expireItem($row)) {
+					continue;
+				}
+			}
+			// Check if resharing is allowed, if not remove share permission
+			if (isset($row['permissions']) && !self::isResharingAllowed()) {
+				$row['permissions'] &= ~\OCP\PERMISSION_SHARE;
+			}
+			// Add display names to result
+			if ( isset($row['share_with']) && $row['share_with'] != '') {
+				$row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']);
+			}
+			if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
+				$row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']);
+			}
+
+			$items[$row['id']] = $row;
+		}
+		if (!empty($items)) {
+			$collectionItems = array();
+			foreach ($items as &$row) {
+				// Return only the item instead of a 2-dimensional array
+				if ($limit == 1 && $row[$column] == $item && ($row['item_type'] == $itemType || $itemType == 'file')) {
+					if ($format == self::FORMAT_NONE) {
+						return $row;
+					} else {
+						break;
+					}
+				}
+				// Check if this is a collection of the requested item type
+				if ($includeCollections && $collectionTypes && in_array($row['item_type'], $collectionTypes)) {
+					if (($collectionBackend = self::getBackend($row['item_type']))
+						&& $collectionBackend instanceof \OCP\Share_Backend_Collection) {
+						// Collections can be inside collections, check if the item is a collection
+						if (isset($item) && $row['item_type'] == $itemType && $row[$column] == $item) {
+							$collectionItems[] = $row;
+						} else {
+							$collection = array();
+							$collection['item_type'] = $row['item_type'];
+							if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') {
+								$collection['path'] = basename($row['path']);
+							}
+							$row['collection'] = $collection;
+							// Fetch all of the children sources
+							$children = $collectionBackend->getChildren($row[$column]);
+							foreach ($children as $child) {
+								$childItem = $row;
+								$childItem['item_type'] = $itemType;
+								if ($row['item_type'] != 'file' && $row['item_type'] != 'folder') {
+									$childItem['item_source'] = $child['source'];
+									$childItem['item_target'] = $child['target'];
+								}
+								if ($backend instanceof \OCP\Share_Backend_File_Dependent) {
+									if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') {
+										$childItem['file_source'] = $child['source'];
+									} else { // TODO is this really needed if we already know that we use the file backend?
+										$meta = \OC\Files\Filesystem::getFileInfo($child['file_path']);
+										$childItem['file_source'] = $meta['fileid'];
+									}
+									$childItem['file_target'] =
+										\OC\Files\Filesystem::normalizePath($child['file_path']);
+								}
+								if (isset($item)) {
+									if ($childItem[$column] == $item) {
+										// Return only the item instead of a 2-dimensional array
+										if ($limit == 1) {
+											if ($format == self::FORMAT_NONE) {
+												return $childItem;
+											} else {
+												// Unset the items array and break out of both loops
+												$items = array();
+												$items[] = $childItem;
+												break 2;
+											}
+										} else {
+											$collectionItems[] = $childItem;
+										}
+									}
+								} else {
+									$collectionItems[] = $childItem;
+								}
+							}
+						}
+					}
+					// Remove collection item
+					$toRemove = $row['id'];
+					if (array_key_exists($toRemove, $switchedItems)) {
+						$toRemove = $switchedItems[$toRemove];
+					}
+					unset($items[$toRemove]);
+				}
+			}
+			if (!empty($collectionItems)) {
+				$items = array_merge($items, $collectionItems);
+			}
+
+			return self::formatResult($items, $column, $backend, $format, $parameters);
+		}
+
+		return array();
+	}
+
+	/**
+	 * Put shared item into the database
+	 * @param string Item type
+	 * @param string Item source
+	 * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+	 * @param string User or group the item is being shared with
+	 * @param string User that is the owner of shared item
+	 * @param int CRUDS permissions
+	 * @param bool|array Parent folder target (optional)
+	 * @param string token (optional)
+	 * @param string name of the source item (optional)
+	 * @return bool Returns true on success or false on failure
+	 */
+	private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
+		$permissions, $parentFolder = null, $token = null, $itemSourceName = null) {
+		$backend = self::getBackend($itemType);
+
+		// Check if this is a reshare
+		if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
+
+			// Check if attempting to share back to owner
+			if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) {
+				$message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' is the original sharer';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+			// Check if share permissions is granted
+			if (self::isResharingAllowed() && (int)$checkReshare['permissions'] & \OCP\PERMISSION_SHARE) {
+				if (~(int)$checkReshare['permissions'] & $permissions) {
+					$message = 'Sharing '.$itemSourceName
+						.' failed, because the permissions exceed permissions granted to '.$uidOwner;
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				} else {
+					// TODO Don't check if inside folder
+					$parent = $checkReshare['id'];
+					$itemSource = $checkReshare['item_source'];
+					$fileSource = $checkReshare['file_source'];
+					$suggestedItemTarget = $checkReshare['item_target'];
+					$suggestedFileTarget = $checkReshare['file_target'];
+					$filePath = $checkReshare['file_target'];
+				}
+			} else {
+				$message = 'Sharing '.$itemSourceName.' failed, because resharing is not allowed';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+		} else {
+			$parent = null;
+			$suggestedItemTarget = null;
+			$suggestedFileTarget = null;
+			if (!$backend->isValidSource($itemSource, $uidOwner)) {
+				$message = 'Sharing '.$itemSource.' failed, because the sharing backend for '
+					.$itemType.' could not find its source';
+				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+				throw new \Exception($message);
+			}
+			if ($backend instanceof \OCP\Share_Backend_File_Dependent) {
+				$filePath = $backend->getFilePath($itemSource, $uidOwner);
+				if ($itemType == 'file' || $itemType == 'folder') {
+					$fileSource = $itemSource;
+				} else {
+					$meta = \OC\Files\Filesystem::getFileInfo($filePath);
+					$fileSource = $meta['fileid'];
+				}
+				if ($fileSource == -1) {
+					$message = 'Sharing '.$itemSource.' failed, because the file could not be found in the file cache';
+					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+					throw new \Exception($message);
+				}
+			} else {
+				$filePath = null;
+				$fileSource = null;
+			}
+		}
+		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`,'
+			.' `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
+			.' `file_target`, `token`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
+		// Share with a group
+		if ($shareType == self::SHARE_TYPE_GROUP) {
+			$groupItemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
+				$uidOwner, $suggestedItemTarget);
+			$run = true;
+			$error = '';
+			\OC_Hook::emit('OCP\Share', 'pre_shared', array(
+				'itemType' => $itemType,
+				'itemSource' => $itemSource,
+				'itemTarget' => $groupItemTarget,
+				'shareType' => $shareType,
+				'shareWith' => $shareWith['group'],
+				'uidOwner' => $uidOwner,
+				'permissions' => $permissions,
+				'fileSource' => $fileSource,
+				'token' => $token,
+				'run' => &$run,
+				'error' => &$error
+			));
+
+			if ($run === false) {
+				throw new \Exception($error);
+			}
+
+			if (isset($fileSource)) {
+				if ($parentFolder) {
+					if ($parentFolder === true) {
+						$groupFileTarget = Helper::generateTarget('file', $filePath, $shareType,
+							$shareWith['group'], $uidOwner, $suggestedFileTarget);
+						// Set group default file target for future use
+						$parentFolders[0]['folder'] = $groupFileTarget;
+					} else {
+						// Get group default file target
+						$groupFileTarget = $parentFolder[0]['folder'].$itemSource;
+						$parent = $parentFolder[0]['id'];
+					}
+				} else {
+					$groupFileTarget = Helper::generateTarget('file', $filePath, $shareType, $shareWith['group'],
+						$uidOwner, $suggestedFileTarget);
+				}
+			} else {
+				$groupFileTarget = null;
+			}
+			$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType,
+				$shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token));
+			// Save this id, any extra rows for this group share will need to reference it
+			$parent = \OC_DB::insertid('*PREFIX*share');
+			// Loop through all users of this group in case we need to add an extra row
+			foreach ($shareWith['users'] as $uid) {
+				$itemTarget = Helper::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid,
+					$uidOwner, $suggestedItemTarget, $parent);
+				if (isset($fileSource)) {
+					if ($parentFolder) {
+						if ($parentFolder === true) {
+							$fileTarget = Helper::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid,
+								$uidOwner, $suggestedFileTarget, $parent);
+							if ($fileTarget != $groupFileTarget) {
+								$parentFolders[$uid]['folder'] = $fileTarget;
+							}
+						} else if (isset($parentFolder[$uid])) {
+							$fileTarget = $parentFolder[$uid]['folder'].$itemSource;
+							$parent = $parentFolder[$uid]['id'];
+						}
+					} else {
+						$fileTarget = Helper::generateTarget('file', $filePath, self::SHARE_TYPE_USER,
+							$uid, $uidOwner, $suggestedFileTarget, $parent);
+					}
+				} else {
+					$fileTarget = null;
+				}
+				// Insert an extra row for the group share if the item or file target is unique for this user
+				if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
+					$query->execute(array($itemType, $itemSource, $itemTarget, $parent,
+						self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(),
+							$fileSource, $fileTarget, $token));
+					$id = \OC_DB::insertid('*PREFIX*share');
+				}
+			}
+			\OC_Hook::emit('OCP\Share', 'post_shared', array(
+				'itemType' => $itemType,
+				'itemSource' => $itemSource,
+				'itemTarget' => $groupItemTarget,
+				'parent' => $parent,
+				'shareType' => $shareType,
+				'shareWith' => $shareWith['group'],
+				'uidOwner' => $uidOwner,
+				'permissions' => $permissions,
+				'fileSource' => $fileSource,
+				'fileTarget' => $groupFileTarget,
+				'id' => $parent,
+				'token' => $token
+			));
+
+			if ($parentFolder === true) {
+				// Return parent folders to preserve file target paths for potential children
+				return $parentFolders;
+			}
+		} else {
+			$itemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
+				$suggestedItemTarget);
+			$run = true;
+			$error = '';
+			\OC_Hook::emit('OCP\Share', 'pre_shared', array(
+				'itemType' => $itemType,
+				'itemSource' => $itemSource,
+				'itemTarget' => $itemTarget,
+				'shareType' => $shareType,
+				'shareWith' => $shareWith,
+				'uidOwner' => $uidOwner,
+				'permissions' => $permissions,
+				'fileSource' => $fileSource,
+				'token' => $token,
+				'run' => &$run,
+				'error' => &$error
+			));
+
+			if ($run === false) {
+				throw new \Exception($error);
+			}
+
+			if (isset($fileSource)) {
+				if ($parentFolder) {
+					if ($parentFolder === true) {
+						$fileTarget = Helper::generateTarget('file', $filePath, $shareType, $shareWith,
+							$uidOwner, $suggestedFileTarget);
+						$parentFolders['folder'] = $fileTarget;
+					} else {
+						$fileTarget = $parentFolder['folder'].$itemSource;
+						$parent = $parentFolder['id'];
+					}
+				} else {
+					$fileTarget = Helper::generateTarget('file', $filePath, $shareType, $shareWith, $uidOwner,
+						$suggestedFileTarget);
+				}
+			} else {
+				$fileTarget = null;
+			}
+			$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner,
+				$permissions, time(), $fileSource, $fileTarget, $token));
+			$id = \OC_DB::insertid('*PREFIX*share');
+			\OC_Hook::emit('OCP\Share', 'post_shared', array(
+				'itemType' => $itemType,
+				'itemSource' => $itemSource,
+				'itemTarget' => $itemTarget,
+				'parent' => $parent,
+				'shareType' => $shareType,
+				'shareWith' => $shareWith,
+				'uidOwner' => $uidOwner,
+				'permissions' => $permissions,
+				'fileSource' => $fileSource,
+				'fileTarget' => $fileTarget,
+				'id' => $id,
+				'token' => $token
+			));
+			if ($parentFolder === true) {
+				$parentFolders['id'] = $id;
+				// Return parent folder to preserve file target paths for potential children
+				return $parentFolders;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * Delete all shares with type SHARE_TYPE_LINK
+	 */
+	public static function removeAllLinkShares() {
+		// Delete any link shares
+		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*share` WHERE `share_type` = ?');
+		$result = $query->execute(array(self::SHARE_TYPE_LINK));
+		while ($item = $result->fetchRow()) {
+			Helper::delete($item['id']);
+		}
+	}
+
+	/**
+	 * In case a password protected link is not yet authenticated this function will return false
+	 *
+	 * @param array $linkItem
+	 * @return bool
+	 */
+	public static function checkPasswordProtectedShare(array $linkItem) {
+		if (!isset($linkItem['share_with'])) {
+			return true;
+		}
+		if (!isset($linkItem['share_type'])) {
+			return true;
+		}
+		if (!isset($linkItem['id'])) {
+			return true;
+		}
+
+		if ($linkItem['share_type'] != \OCP\Share::SHARE_TYPE_LINK) {
+			return true;
+		}
+
+		if ( \OC::$session->exists('public_link_authenticated')
+			&& \OC::$session->get('public_link_authenticated') === $linkItem['id'] ) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @breif construct select statement
+	 * @param int $format
+	 * @param bool $fileDependent ist it a file/folder share or a generla share
+	 * @param string $uidOwner
+	 * @return string select statement
+	 */
+	private static function createSelectStatement($format, $fileDependent, $uidOwner = null) {
+		$select = '*';
+		if ($format == self::FORMAT_STATUSES) {
+			if ($fileDependent) {
+				$select = '`*PREFIX*share`.`id`, `*PREFIX*share`.`parent`, `share_type`, `path`, `share_with`, `uid_owner`';
+			} else {
+				$select = '`id`, `parent`, `share_type`, `share_with`, `uid_owner`';
+			}
+		} else {
+			if (isset($uidOwner)) {
+				if ($fileDependent) {
+					$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `*PREFIX*share`.`parent`,'
+							. ' `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`,'
+							. ' `expiration`, `token`, `storage`, `mail_send`, `uid_owner`';
+				} else {
+					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`,'
+							. ' `stime`, `file_source`, `expiration`, `token`, `mail_send`, `uid_owner`';
+				}
+			} else {
+				if ($fileDependent) {
+					if ($format == \OC_Share_Backend_File::FORMAT_GET_FOLDER_CONTENTS || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) {
+						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `*PREFIX*share`.`parent`, `uid_owner`, '
+								. '`share_type`, `share_with`, `file_source`, `path`, `file_target`, '
+								. '`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, '
+								. '`name`, `mtime`, `mimetype`, `mimepart`, `size`, `unencrypted_size`, `encrypted`, `etag`, `mail_send`';
+					} else {
+						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`,
+							`*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`,
+							`file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`, `storage`, `mail_send`';
+					}
+				}
+			}
+		}
+		return $select;
+	}
+
+
+	/**
+	 * @brief transform db results
+	 * @param array $row result
+	 */
+	private static function transformDBResults(&$row) {
+		if (isset($row['id'])) {
+			$row['id'] = (int) $row['id'];
+		}
+		if (isset($row['share_type'])) {
+			$row['share_type'] = (int) $row['share_type'];
+		}
+		if (isset($row['parent'])) {
+			$row['parent'] = (int) $row['parent'];
+		}
+		if (isset($row['file_parent'])) {
+			$row['file_parent'] = (int) $row['file_parent'];
+		}
+		if (isset($row['file_source'])) {
+			$row['file_source'] = (int) $row['file_source'];
+		}
+		if (isset($row['permissions'])) {
+			$row['permissions'] = (int) $row['permissions'];
+		}
+		if (isset($row['storage'])) {
+			$row['storage'] = (int) $row['storage'];
+		}
+		if (isset($row['stime'])) {
+			$row['stime'] = (int) $row['stime'];
+		}
+	}
+
+	/**
+	 * @brief format result
+	 * @param array $items result
+	 * @prams string $column is it a file share or a general share ('file_target' or 'item_target')
+	 * @params \OCP\Share_Backend $backend sharing backend
+	 * @param int $format
+	 * @param array additional format parameters
+	 * @return array formate result
+	 */
+	private static function formatResult($items, $column, $backend, $format = self::FORMAT_NONE , $parameters = null) {
+		if ($format === self::FORMAT_NONE) {
+			return $items;
+		} else if ($format === self::FORMAT_STATUSES) {
+			$statuses = array();
+			foreach ($items as $item) {
+				if ($item['share_type'] === self::SHARE_TYPE_LINK) {
+					$statuses[$item[$column]]['link'] = true;
+				} else if (!isset($statuses[$item[$column]])) {
+					$statuses[$item[$column]]['link'] = false;
+				}
+				if ('file_target') {
+					$statuses[$item[$column]]['path'] = $item['path'];
+				}
+			}
+			return $statuses;
+		} else {
+			return $backend->formatItems($items, $format, $parameters);
+		}
+	}
+}
diff --git a/lib/private/template/base.php b/lib/private/template/base.php
index 8af2fce773..3d7c685c1c 100644
--- a/lib/private/template/base.php
+++ b/lib/private/template/base.php
@@ -61,7 +61,7 @@ class Base {
 	/**
 	 * @brief Assign variables
 	 * @param string $key key
-	 * @param mixed $value value
+	 * @param array|bool|integer|string $value value
 	 * @return bool
 	 *
 	 * This function assigns a variable. It can be accessed via $_[$key] in
diff --git a/lib/private/updater.php b/lib/private/updater.php
index f05d5038b7..9f57aa0b6a 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 {
@@ -76,7 +73,9 @@ class Updater extends BasicEmitter {
 		if ($xml == false) {
 			return array();
 		}
+		$loadEntities = libxml_disable_entity_loader(true);
 		$data = @simplexml_load_string($xml);
+		libxml_disable_entity_loader($loadEntities);
 
 		$tmp = array();
 		$tmp['version'] = $data->version;
@@ -103,10 +102,15 @@ class Updater extends BasicEmitter {
 		}
 		$this->emit('\OC\Updater', 'maintenanceStart');
 
+		// create empty file in data dir, so we can later find
+		// out that this is indeed an ownCloud data directory
+		// (in case it didn't exist before)
+		file_put_contents(\OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data').'/.ocdata', '');
+
 		/*
 		 * START CONFIG CHANGES FOR OLDER VERSIONS
 		 */
-		if (version_compare($currentVersion, '6.90.1', '<')) {
+		if (!\OC::$CLI && version_compare($installedVersion, '6.90.1', '<')) {
 			// Add the overwriteHost config if it is not existant
 			// This is added to prevent host header poisoning
 			\OC_Config::setValue('trusted_domains', \OC_Config::getValue('trusted_domains', array(\OC_Request::serverHost()))); 
@@ -120,9 +124,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()));
 		}
@@ -134,46 +135,11 @@ class Updater extends BasicEmitter {
 		$repair = new Repair();
 		$repair->run();
 
+		//Invalidate update feed
+		\OC_Appconfig::setValue('core', 'lastupdatedat', 0);
 		\OC_Config::setValue('maintenance', false);
 		$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/lib/private/urlgenerator.php b/lib/private/urlgenerator.php
index 60da34f2d6..0d238737dd 100644
--- a/lib/private/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -39,7 +39,7 @@ class URLGenerator implements IURLGenerator {
 	 * Returns a url to the given app and file.
 	 */
 	public function linkToRoute($route, $parameters = array()) {
-		$urlLinkTo = \OC::getRouter()->generate($route, $parameters);
+		$urlLinkTo = \OC::$server->getRouter()->generate($route, $parameters);
 		return $urlLinkTo;
 	}
 
@@ -60,7 +60,7 @@ class URLGenerator implements IURLGenerator {
 			$app_path = \OC_App::getAppPath($app);
 			// Check if the app is in the app folder
 			if ($app_path && file_exists($app_path . '/' . $file)) {
-				if (substr($file, -3) == 'php' || substr($file, -3) == 'css') {
+				if (substr($file, -3) == 'php') {
 
 					$urlLinkTo = \OC::$WEBROOT . '/index.php/apps/' . $app;
 					if ($frontControllerActive) {
@@ -148,6 +148,7 @@ class URLGenerator implements IURLGenerator {
 	 */
 	public function getAbsoluteURL($url) {
 		$separator = $url[0] === '/' ? '' : '/';
-		return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . $separator . $url;
+
+		return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost(). \OC::$WEBROOT . $separator . $url;
 	}
 }
diff --git a/lib/private/user.php b/lib/private/user.php
index a89b7286c1..dc4c7ec3b6 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -321,8 +321,6 @@ class OC_User {
 	 */
 	public static function isLoggedIn() {
 		if (\OC::$session->get('user_id') && self::$incognitoMode === false) {
-			OC_App::loadApps(array('authentication'));
-			self::setupBackends();
 			return self::userExists(\OC::$session->get('user_id'));
 		}
 		return false;
diff --git a/lib/private/util.php b/lib/private/util.php
index 920161949a..731b7c9750 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -30,9 +30,7 @@ class OC_Util {
 		}
 
 		// load all filesystem apps before, so no setup-hook gets lost
-		if(!isset($RUNTIME_NOAPPS) || !$RUNTIME_NOAPPS) {
-			OC_App::loadApps(array('filesystem'));
-		}
+		OC_App::loadApps(array('filesystem'));
 
 		// the filesystem will finish when $user is not empty,
 		// mark fs setup here to avoid doing the setup from loading
@@ -290,12 +288,18 @@ class OC_Util {
 	 * @return array arrays with error messages and hints
 	 */
 	public static function checkServer() {
-		// Assume that if checkServer() succeeded before in this session, then all is fine.
-		if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) {
-			return array();
+		$errors = array();
+		$CONFIG_DATADIRECTORY = OC_Config::getValue('datadirectory', OC::$SERVERROOT . '/data');
+
+		if (!\OC::needUpgrade() && OC_Config::getValue('installed', false)) {
+			// this check needs to be done every time
+			$errors = self::checkDataDirectoryValidity($CONFIG_DATADIRECTORY);
 		}
 
-		$errors = array();
+		// Assume that if checkServer() succeeded before in this session, then all is fine.
+		if(\OC::$session->exists('checkServer_suceeded') && \OC::$session->get('checkServer_suceeded')) {
+			return $errors;
+		}
 
 		$defaults = new \OC_Defaults();
 
@@ -341,7 +345,6 @@ class OC_Util {
 					);
 			}
 		}
-		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		// Create root dir.
 		if(!is_dir($CONFIG_DATADIRECTORY)) {
 			$success=@mkdir($CONFIG_DATADIRECTORY);
@@ -485,12 +488,47 @@ class OC_Util {
 			);
 		}
 
+		$errors = array_merge($errors, self::checkDatabaseVersion());
+
 		// Cache the result of this function
 		\OC::$session->set('checkServer_suceeded', count($errors) == 0);
 
 		return $errors;
 	}
 
+	/**
+	 * Check the database version
+	 * @return array errors array
+	 */
+	public static function checkDatabaseVersion() {
+		$errors = array();
+		$dbType = \OC_Config::getValue('dbtype', 'sqlite');
+		if ($dbType === 'pgsql') {
+			// check PostgreSQL version
+			try {
+				$result = \OC_DB::executeAudited('SHOW SERVER_VERSION');
+				$data = $result->fetchRow();
+				if (isset($data['server_version'])) {
+					$version = $data['server_version'];
+					if (version_compare($version, '9.0.0', '<')) {
+						$errors[] = array(
+							'error' => 'PostgreSQL >= 9 required',
+							'hint' => 'Please upgrade your database version'
+						);
+					}
+				}
+			} catch (\Doctrine\DBAL\DBALException $e) {
+				\OCP\Util::logException('core', $e);
+				$errors[] = array(
+					'error' => 'Error occurred while checking PostgreSQL version',
+					'hint' => 'Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error'
+				);
+			}
+		}
+		return $errors;
+	}
+
+
 	/**
 	 * @brief check if there are still some encrypted files stored
 	 * @return boolean
@@ -526,7 +564,7 @@ class OC_Util {
 				.' cannot be listed by other users.';
 			$perms = substr(decoct(@fileperms($dataDirectory)), -3);
 			if (substr($perms, -1) != '0') {
-				OC_Helper::chmodr($dataDirectory, 0770);
+				chmod($dataDirectory, 0770);
 				clearstatcache();
 				$perms = substr(decoct(@fileperms($dataDirectory)), -3);
 				if (substr($perms, 2, 1) != '0') {
@@ -540,6 +578,25 @@ class OC_Util {
 		return $errors;
 	}
 
+	/**
+	 * Check that the data directory exists and is valid by
+	 * checking the existence of the ".ocdata" file.
+	 *
+	 * @param string $dataDirectory data directory path
+	 * @return bool true if the data directory is valid, false otherwise
+	 */
+	public static function checkDataDirectoryValidity($dataDirectory) {
+		$errors = array();
+		if (!file_exists($dataDirectory.'/.ocdata')) {
+			$errors[] = array(
+				'error' => 'Data directory (' . $dataDirectory . ') is invalid',
+				'hint' => 'Please check that the data directory contains a file' .
+					' ".ocdata" in its root.'
+			);
+		}
+		return $errors;
+	}
+
 	/**
 	 * @return void
 	 */
@@ -644,17 +701,18 @@ class OC_Util {
 	 * @return void
 	 */
 	public static function redirectToDefaultPage() {
+		$urlGenerator = \OC::$server->getURLGenerator();
 		if(isset($_REQUEST['redirect_url'])) {
-			$location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
+			$location = urldecode($_REQUEST['redirect_url']);
 		}
 		else if (isset(OC::$REQUESTEDAPP) && !empty(OC::$REQUESTEDAPP)) {
-			$location = OC_Helper::linkToAbsolute( OC::$REQUESTEDAPP, 'index.php' );
+			$location = $urlGenerator->getAbsoluteURL('/index.php/apps/'.OC::$REQUESTEDAPP.'/index.php');
 		} else {
 			$defaultPage = OC_Appconfig::getValue('core', 'defaultpage');
 			if ($defaultPage) {
-				$location = OC_Helper::makeURLAbsolute(OC::$WEBROOT.'/'.$defaultPage);
+				$location = $urlGenerator->getAbsoluteURL($defaultPage);
 			} else {
-				$location = OC_Helper::linkToAbsolute( 'files', 'index.php' );
+				$location = $urlGenerator->getAbsoluteURL('/index.php/files/index.php');
 			}
 		}
 		OC_Log::write('core', 'redirectToDefaultPage: '.$location, OC_Log::DEBUG);
@@ -1015,13 +1073,13 @@ class OC_Util {
 	public static function getUrlContent($url) {
 		if (function_exists('curl_init')) {
 			$curl = curl_init();
+			$max_redirects = 10;
 
 			curl_setopt($curl, CURLOPT_HEADER, 0);
 			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
 			curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
 			curl_setopt($curl, CURLOPT_URL, $url);
-			curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-			curl_setopt($curl, CURLOPT_MAXREDIRS, 10);
+			
 
 			curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
 			if(OC_Config::getValue('proxy', '') != '') {
@@ -1030,9 +1088,50 @@ class OC_Util {
 			if(OC_Config::getValue('proxyuserpwd', '') != '') {
 				curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd'));
 			}
-			$data = curl_exec($curl);
+			
+			if (ini_get('open_basedir') === '' && ini_get('safe_mode' === 'Off')) { 
+				curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
+				curl_setopt($curl, CURLOPT_MAXREDIRS, $max_redirects);
+				$data = curl_exec($curl);
+			} else {
+				curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
+				$mr = $max_redirects;
+				if ($mr > 0) { 
+					$newurl = curl_getinfo($curl, CURLINFO_EFFECTIVE_URL);
+					
+					$rcurl = curl_copy_handle($curl);
+					curl_setopt($rcurl, CURLOPT_HEADER, true);
+					curl_setopt($rcurl, CURLOPT_NOBODY, true);
+					curl_setopt($rcurl, CURLOPT_FORBID_REUSE, false);
+					curl_setopt($rcurl, CURLOPT_RETURNTRANSFER, true);
+					do {
+						curl_setopt($rcurl, CURLOPT_URL, $newurl);
+						$header = curl_exec($rcurl);
+						if (curl_errno($rcurl)) {
+							$code = 0;
+						} else {
+							$code = curl_getinfo($rcurl, CURLINFO_HTTP_CODE);
+							if ($code == 301 || $code == 302) {
+								preg_match('/Location:(.*?)\n/', $header, $matches);
+								$newurl = trim(array_pop($matches));
+							} else {
+								$code = 0;
+							}
+						}
+					} while ($code && --$mr);
+					curl_close($rcurl);
+					if ($mr > 0) {
+						curl_setopt($curl, CURLOPT_URL, $newurl);
+					} 
+				}
+				
+				if($mr == 0 && $max_redirects > 0) {
+					$data = false;
+				} else {
+					$data = curl_exec($curl);
+				}
+			}
 			curl_close($curl);
-
 		} else {
 			$contextArray = null;
 
@@ -1061,12 +1160,21 @@ class OC_Util {
 	}
 
 	/**
-	 * @return bool - well are we running on windows or not
+	 * Checks whether the server is running on Windows
+	 * @return bool true if running on Windows, false otherwise
 	 */
 	public static function runningOnWindows() {
 		return (substr(PHP_OS, 0, 3) === "WIN");
 	}
 
+	/**
+	 * Checks whether the server is running on Mac OS X
+	 * @return bool true if running on Mac OS X, false otherwise
+	 */
+	public static function runningOnMac() {
+		return (strtoupper(substr(PHP_OS, 0, 6)) === 'DARWIN');
+	}
+
 	/**
 	 * Handles the case that there may not be a theme, then check if a "default"
 	 * theme exists and take that one
diff --git a/lib/public/appframework/app.php b/lib/public/appframework/app.php
index 90150245c4..2161232787 100644
--- a/lib/public/appframework/app.php
+++ b/lib/public/appframework/app.php
@@ -67,7 +67,7 @@ class App {
 	 * $a = new TasksApp();
 	 * $a->registerRoutes($this, $routes);
 	 *
-	 * @param \OC_Router $router
+	 * @param \OCP\Route\IRouter $router
 	 * @param array $routes
 	 */
 	public function registerRoutes($router, $routes) {
diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php
index 68ce45d3fa..37162e0933 100644
--- a/lib/public/files/fileinfo.php
+++ b/lib/public/files/fileinfo.php
@@ -9,7 +9,7 @@ namespace OCP\Files;
 
 interface FileInfo {
 	const TYPE_FILE = 'file';
-	const TYPE_FOLDER = 'folder';
+	const TYPE_FOLDER = 'dir';
 
 	/**
 	 * Get the Etag of the file or folder
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 0eb358816d..600d81d83a 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -190,4 +190,10 @@ interface IServerContainer {
 	 */
 	function getJobList();
 
+	/**
+	 * Returns a router for generating and matching urls
+	 *
+	 * @return \OCP\Route\IRouter
+	 */
+	function getRouter();
 }
diff --git a/lib/public/isession.php b/lib/public/isession.php
index 20da712cda..dc5719625c 100644
--- a/lib/public/isession.php
+++ b/lib/public/isession.php
@@ -75,4 +75,9 @@ interface ISession {
 	 */
 	public function clear();
 
+	/**
+	 * Close the session and release the lock
+	 */
+	public function close();
+
 }
diff --git a/lib/public/route/iroute.php b/lib/public/route/iroute.php
new file mode 100644
index 0000000000..66fdb84182
--- /dev/null
+++ b/lib/public/route/iroute.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OCP\Route;
+
+interface IRoute {
+	/**
+	 * Specify PATCH as the method to use with this route
+	 */
+	public function patch();
+
+	/**
+	 * Specify the method when this route is to be used
+	 *
+	 * @param string $method HTTP method (uppercase)
+	 * @return \OCP\Route\IRoute
+	 */
+	public function method($method);
+
+	/**
+	 * The action to execute when this route matches, includes a file like
+	 * it is called directly
+	 *
+	 * @param $file
+	 */
+	public function actionInclude($file);
+
+	/**
+	 * Specify GET as the method to use with this route
+	 */
+	public function get();
+
+	/**
+	 * Specify POST as the method to use with this route
+	 */
+	public function post();
+
+	/**
+	 * Specify DELETE as the method to use with this route
+	 */
+	public function delete();
+
+	/**
+	 * The action to execute when this route matches
+	 *
+	 * @param string|callable $class the class or a callable
+	 * @param string $function the function to use with the class
+	 * @return \OCP\Route\IRoute
+	 *
+	 * This function is called with $class set to a callable or
+	 * to the class with $function
+	 */
+	public function action($class, $function = null);
+
+	/**
+	 * Defaults to use for this route
+	 *
+	 * @param array $defaults The defaults
+	 * @return \OCP\Route\IRoute
+	 */
+	public function defaults($defaults);
+
+	/**
+	 * Requirements for this route
+	 *
+	 * @param array $requirements The requirements
+	 * @return \OCP\Route\IRoute
+	 */
+	public function requirements($requirements);
+
+	/**
+	 * Specify PUT as the method to use with this route
+	 */
+	public function put();
+}
diff --git a/lib/public/route/irouter.php b/lib/public/route/irouter.php
new file mode 100644
index 0000000000..125cd29e81
--- /dev/null
+++ b/lib/public/route/irouter.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OCP\Route;
+
+interface IRouter {
+
+	/**
+	 * Get the files to load the routes from
+	 *
+	 * @return string[]
+	 */
+	public function getRoutingFiles();
+
+	public function getCacheKey();
+
+	/**
+	 * loads the api routes
+	 */
+	public function loadRoutes($app = null);
+
+	/**
+	 * Sets the collection to use for adding routes
+	 *
+	 * @param string $name Name of the collection to use.
+	 */
+	public function useCollection($name);
+
+	/**
+	 * Create a \OCP\Route\IRoute.
+	 *
+	 * @param string $name Name of the route to create.
+	 * @param string $pattern The pattern to match
+	 * @param array $defaults An array of default parameter values
+	 * @param array $requirements An array of requirements for parameters (regexes)
+	 * @return \OCP\Route\IRoute
+	 */
+	public function create($name, $pattern, array $defaults = array(), array $requirements = array());
+
+	/**
+	 * Find the route matching $url.
+	 *
+	 * @param string $url The url to find
+	 * @throws \Exception
+	 */
+	public function match($url);
+
+	/**
+	 * Get the url generator
+	 *
+	 */
+	public function getGenerator();
+
+	/**
+	 * Generate url based on $name and $parameters
+	 *
+	 * @param string $name Name of the route to use.
+	 * @param array $parameters Parameters for the route
+	 * @param bool $absolute
+	 * @return string
+	 */
+	public function generate($name, $parameters = array(), $absolute = false);
+
+}
diff --git a/lib/public/share.php b/lib/public/share.php
index 2fed41488c..a08134b383 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -2,8 +2,9 @@
 /**
  * ownCloud
  *
- * @author Michael Gapczynski
- * @copyright 2012 Michael Gapczynski mtgap@owncloud.com
+ * @author Bjoern Schiessle, Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski <mtgap@owncloud.com>
+ *            2014 Bjoern Schiessle <schiessle@owncloud.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -36,41 +37,7 @@ namespace OCP;
  * It provides the following hooks:
  *  - post_shared
  */
-class Share {
-
-	const SHARE_TYPE_USER = 0;
-	const SHARE_TYPE_GROUP = 1;
-	const SHARE_TYPE_LINK = 3;
-	const SHARE_TYPE_EMAIL = 4;
-	const SHARE_TYPE_CONTACT = 5;
-	const SHARE_TYPE_REMOTE = 6;
-
-	/** CRUDS permissions (Create, Read, Update, Delete, Share) using a bitmask
-	 * Construct permissions for share() and setPermissions with Or (|) e.g.
-	 * Give user read and update permissions: PERMISSION_READ | PERMISSION_UPDATE
-	 *
-	 * Check if permission is granted with And (&) e.g. Check if delete is
-	 * granted: if ($permissions & PERMISSION_DELETE)
-	 *
-	 * Remove permissions with And (&) and Not (~) e.g. Remove the update
-	 * permission: $permissions &= ~PERMISSION_UPDATE
-	 *
-	 * Apps are required to handle permissions on their own, this class only
-	 * stores and manages the permissions of shares
-	 * @see lib/public/constants.php
-	 */
-
-	const FORMAT_NONE = -1;
-	const FORMAT_STATUSES = -2;
-	const FORMAT_SOURCES = -3;
-
-	const TOKEN_LENGTH = 32; // see db_structure.xml
-
-	private static $shareTypeUserAndGroups = -1;
-	private static $shareTypeGroupUserUnique = 2;
-	private static $backends = array();
-	private static $backendTypes = array();
-	private static $isResharingAllowed;
+class Share extends \OC\Share\Constants {
 
 	/**
 	 * Register a sharing backend class that implements OCP\Share_Backend for an item type
@@ -78,67 +45,25 @@ class Share {
 	 * @param string Backend class
 	 * @param string (optional) Depends on item type
 	 * @param array (optional) List of supported file extensions if this item type depends on files
-	 * @param string $itemType
-	 * @param string $class
-	 * @param string $collectionOf
-	 * @return boolean true if backend is registered or false if error
+	 * @return Returns true if backend is registered or false if error
 	 */
 	public static function registerBackend($itemType, $class, $collectionOf = null, $supportedFileExtensions = null) {
-		if (self::isEnabled()) {
-			if (!isset(self::$backendTypes[$itemType])) {
-				self::$backendTypes[$itemType] = array(
-					'class' => $class,
-					'collectionOf' => $collectionOf,
-					'supportedFileExtensions' => $supportedFileExtensions
-				);
-				if(count(self::$backendTypes) === 1) {
-					\OC_Util::addScript('core', 'share');
-					\OC_Util::addStyle('core', 'share');
-				}
-				return true;
-			}
-			\OC_Log::write('OCP\Share',
-				'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class']
-				.' is already registered for '.$itemType,
-				\OC_Log::WARN);
-		}
-		return false;
+		return \OC\Share\Share::registerBackend($itemType, $class, $collectionOf, $supportedFileExtensions);
 	}
 
 	/**
 	 * Check if the Share API is enabled
-	 * @return boolean true if enabled or false
+	 * @return Returns true if enabled or false
 	 *
 	 * The Share API is enabled by default if not configured
 	 */
 	public static function isEnabled() {
-		if (\OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes') == 'yes') {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Prepare a path to be passed to DB as file_target
-	 * @param string $path path
-	 * @return string Prepared path
-	 */
-	public static function prepFileTarget( $path ) {
-
-		// Paths in DB are stored with leading slashes, so add one if necessary
-		if ( substr( $path, 0, 1 ) !== '/' ) {
-
-			$path = '/' . $path;
-
-		}
-
-		return $path;
-
+		return \OC\Share\Share::isEnabled();
 	}
 
 	/**
 	 * Find which users can access a shared item
-	 * @param string $path to the file
+	 * @param $path to the file
 	 * @param $user owner of the file
 	 * @param include owner to the list of users with access to the file
 	 * @return array
@@ -146,101 +71,7 @@ class Share {
 	 *       not '/admin/data/file.txt'
 	 */
 	public static function getUsersSharingFile($path, $user, $includeOwner = false) {
-
-		$shares = array();
-		$publicShare = false;
-		$source = -1;
-		$cache = false;
-
-		$view = new \OC\Files\View('/' . $user . '/files');
-		if ($view->file_exists($path)) {
-			$meta = $view->getFileInfo($path);
-		} else {
-			// if the file doesn't exists yet we start with the parent folder
-			$meta = $view->getFileInfo(dirname($path));
-		}
-
-		if($meta !== false) {
-			$source = $meta['fileid'];
-			$cache = new \OC\Files\Cache\Cache($meta['storage']);
-		}
-
-		while ($source !== -1) {
-
-			// Fetch all shares with another user
-			$query = \OC_DB::prepare(
-				'SELECT `share_with`
-				FROM
-				`*PREFIX*share`
-				WHERE
-				`item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
-			);
-
-			$result = $query->execute(array($source, self::SHARE_TYPE_USER));
-
-			if (\OCP\DB::isError($result)) {
-				\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
-			} else {
-				while ($row = $result->fetchRow()) {
-					$shares[] = $row['share_with'];
-				}
-			}
-			// We also need to take group shares into account
-
-			$query = \OC_DB::prepare(
-				'SELECT `share_with`
-				FROM
-				`*PREFIX*share`
-				WHERE
-				`item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
-			);
-
-			$result = $query->execute(array($source, self::SHARE_TYPE_GROUP));
-
-			if (\OCP\DB::isError($result)) {
-				\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
-			} else {
-				while ($row = $result->fetchRow()) {
-					$usersInGroup = \OC_Group::usersInGroup($row['share_with']);
-					$shares = array_merge($shares, $usersInGroup);
-				}
-			}
-
-			//check for public link shares
-			if (!$publicShare) {
-				$query = \OC_DB::prepare(
-					'SELECT `share_with`
-					FROM
-					`*PREFIX*share`
-					WHERE
-					`item_source` = ? AND `share_type` = ? AND `item_type` IN (\'file\', \'folder\')'
-				);
-
-				$result = $query->execute(array($source, self::SHARE_TYPE_LINK));
-
-				if (\OCP\DB::isError($result)) {
-					\OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage($result), \OC_Log::ERROR);
-				} else {
-					if ($result->fetchRow()) {
-						$publicShare = true;
-					}
-				}
-			}
-
-			// let's get the parent for the next round
-			$meta = $cache->get((int)$source);
-			if($meta !== false) {
-				$source = (int)$meta['parent'];
-			} else {
-				$source = -1;
-			}
-		}
-		// Include owner in list of users, if requested
-		if ($includeOwner) {
-			$shares[] = $user;
-		}
-
-		return array("users" => array_unique($shares), "public" => $publicShare);
+		return \OC\Share\Share::getUsersSharingFile($path, $user, $includeOwner);
 	}
 
 	/**
@@ -250,13 +81,12 @@ class Share {
 	 * @param mixed Parameters (optional)
 	 * @param int Number of items to return (optional) Returns all by default
 	 * @param bool include collections (optional)
-	 * @param string $itemType
 	 * @return Return depends on format
 	 */
 	public static function getItemsSharedWith($itemType, $format = self::FORMAT_NONE,
 		$parameters = null, $limit = -1, $includeCollections = false) {
-		return self::getItems($itemType, null, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format,
-			$parameters, $limit, $includeCollections);
+
+		return \OC\Share\Share::getItemsSharedWith($itemType, $format, $parameters, $limit, $includeCollections);
 	}
 
 	/**
@@ -266,12 +96,12 @@ class Share {
 	 * @param int $format (optional) Format type must be defined by the backend
 	 * @param mixed Parameters (optional)
 	 * @param bool include collections (optional)
-	 * @return string depends on format
+	 * @return Return depends on format
 	 */
 	public static function getItemSharedWith($itemType, $itemTarget, $format = self::FORMAT_NONE,
 		$parameters = null, $includeCollections = false) {
-		return self::getItems($itemType, $itemTarget, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format,
-			$parameters, 1, $includeCollections);
+
+		return \OC\Share\Share::getItemSharedWith($itemType, $itemTarget, $format, $parameters, $includeCollections);
 	}
 
 	/**
@@ -282,45 +112,7 @@ class Share {
 	 * @return array Return list of items with file_target, permissions and expiration
 	 */
 	public static function getItemSharedWithUser($itemType, $itemSource, $user) {
-
-		$shares = array();
-
-		// first check if there is a db entry for the specific user
-		$query = \OC_DB::prepare(
-				'SELECT `file_target`, `permissions`, `expiration`
-					FROM
-					`*PREFIX*share`
-					WHERE
-					`item_source` = ? AND `item_type` = ? AND `share_with` = ?'
-				);
-
-		$result = \OC_DB::executeAudited($query, array($itemSource, $itemType, $user));
-
-		while ($row = $result->fetchRow()) {
-			$shares[] = $row;
-		}
-
-		//if didn't found a result than let's look for a group share.
-		if(empty($shares)) {
-			$groups = \OC_Group::getUserGroups($user);
-
-			$query = \OC_DB::prepare(
-					'SELECT `file_target`, `permissions`, `expiration`
-						FROM
-						`*PREFIX*share`
-						WHERE
-						`item_source` = ? AND `item_type` = ? AND `share_with` in (?)'
-					);
-
-			$result = \OC_DB::executeAudited($query, array($itemSource, $itemType, implode(',', $groups)));
-
-			while ($row = $result->fetchRow()) {
-				$shares[] = $row;
-			}
-		}
-
-		return $shares;
-
+		return \OC\Share\Share::getItemSharedWithUser($itemType, $itemSource, $user);
 	}
 
 	/**
@@ -334,8 +126,7 @@ class Share {
 	 */
 	public static function getItemSharedWithBySource($itemType, $itemSource, $format = self::FORMAT_NONE,
 		$parameters = null, $includeCollections = false) {
-		return self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format,
-			$parameters, 1, $includeCollections, true);
+		return \OC\Share\Share::getItemSharedWithBySource($itemType, $itemSource, $format, $parameters, $includeCollections);
 	}
 
 	/**
@@ -346,8 +137,7 @@ class Share {
 	 * @return Item
 	 */
 	public static function getItemSharedWithByLink($itemType, $itemSource, $uidOwner) {
-		return self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE,
-			null, 1);
+		return \OC\Share\Share::getItemSharedWithByLink($itemType, $itemSource, $uidOwner);
 	}
 
 	/**
@@ -356,25 +146,7 @@ class Share {
 	 * @return array | bool false will be returned in case the token is unknown or unauthorized
 	 */
 	public static function getShareByToken($token, $checkPasswordProtection = true) {
-		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1);
-		$result = $query->execute(array($token));
-		if (\OC_DB::isError($result)) {
-			\OC_Log::write('OCP\Share', \OC_DB::getErrorMessage($result) . ', token=' . $token, \OC_Log::ERROR);
-		}
-		$row = $result->fetchRow();
-		if ($row === false) {
-			return false;
-		}
-		if (is_array($row) and self::expireItem($row)) {
-			return false;
-		}
-
-		// password protected shares need to be authenticated
-		if ($checkPasswordProtection && !\OCP\Share::checkPasswordProtectedShare($row)) {
-			return false;
-		}
-
-		return $row;
+		return \OC\Share\Share::getShareByToken($token, $checkPasswordProtection);
 	}
 
 	/**
@@ -382,21 +154,8 @@ class Share {
 	 * @param $linkItem
 	 * @return $fileOwner
 	 */
-	public static function resolveReShare($linkItem)
-	{
-		if (isset($linkItem['parent'])) {
-			$parent = $linkItem['parent'];
-			while (isset($parent)) {
-				$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `id` = ?', 1);
-				$item = $query->execute(array($parent))->fetchRow();
-				if (isset($item['parent'])) {
-					$parent = $item['parent'];
-				} else {
-					return $item;
-				}
-			}
-		}
-		return $linkItem;
+	public static function resolveReShare($linkItem) {
+		return \OC\Share\Share::resolveReShare($linkItem);
 	}
 
 
@@ -407,13 +166,12 @@ class Share {
 	 * @param mixed Parameters
 	 * @param int Number of items to return (optional) Returns all by default
 	 * @param bool include collections
-	 * @param string $itemType
 	 * @return Return depends on format
 	 */
 	public static function getItemsShared($itemType, $format = self::FORMAT_NONE, $parameters = null,
 		$limit = -1, $includeCollections = false) {
-		return self::getItems($itemType, null, null, null, \OC_User::getUser(), $format,
-			$parameters, $limit, $includeCollections);
+
+		return \OC\Share\Share::getItemsShared($itemType, $format, $parameters, $limit, $includeCollections);
 	}
 
 	/**
@@ -427,8 +185,8 @@ class Share {
 	 */
 	public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE,
 	                                     $parameters = null, $includeCollections = false) {
-		return self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), $format,
-			$parameters, -1, $includeCollections);
+
+		return \OC\Share\Share::getItemShared($itemType, $itemSource, $format, $parameters, $includeCollections);
 	}
 
 	/**
@@ -441,19 +199,7 @@ class Share {
 	 * @return Return array of users
 	 */
 	public static function getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections = false, $checkExpireDate = true) {
-
-		$users = array();
-		$items = self::getItems($itemType, $itemSource, null, null, $uidOwner, self::FORMAT_NONE, null, -1, $includeCollections, false, $checkExpireDate);
-		if ($items) {
-			foreach ($items as $item) {
-				if ((int)$item['share_type'] === self::SHARE_TYPE_USER) {
-					$users[] = $item['share_with'];
-				} else if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) {
-					$users = array_merge($users, \OC_Group::usersInGroup($item['share_with']));
-				}
-			}
-		}
-		return $users;
+		return \OC\Share\Share::getUsersItemShared($itemType, $itemSource, $uidOwner, $includeCollections, $checkExpireDate);
 	}
 
 	/**
@@ -473,176 +219,7 @@ class Share {
 	 * @return bool|string Returns true on success or false on failure, Returns token on success for links
 	 */
 	public static function shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName = null) {
-		$uidOwner = \OC_User::getUser();
-		$sharingPolicy = \OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global');
-
-		if (is_null($itemSourceName)) {
-			$itemSourceName = $itemSource;
-		}
-
-		// Verify share type and sharing conditions are met
-		if ($shareType === self::SHARE_TYPE_USER) {
-			if ($shareWith == $uidOwner) {
-				$message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' is the item owner';
-				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-				throw new \Exception($message);
-			}
-			if (!\OC_User::userExists($shareWith)) {
-				$message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' does not exist';
-				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-				throw new \Exception($message);
-			}
-			if ($sharingPolicy == 'groups_only') {
-				$inGroup = array_intersect(\OC_Group::getUserGroups($uidOwner), \OC_Group::getUserGroups($shareWith));
-				if (empty($inGroup)) {
-					$message = 'Sharing '.$itemSourceName.' failed, because the user '
-						.$shareWith.' is not a member of any groups that '.$uidOwner.' is a member of';
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				}
-			}
-			// Check if the item source is already shared with the user, either from the same owner or a different user
-			if ($checkExists = self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups,
-				$shareWith, null, self::FORMAT_NONE, null, 1, true, true)) {
-				// Only allow the same share to occur again if it is the same
-				// owner and is not a user share, this use case is for increasing
-				// permissions for a specific user
-				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
-					$message = 'Sharing '.$itemSourceName.' failed, because this item is already shared with '.$shareWith;
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				}
-			}
-		} else if ($shareType === self::SHARE_TYPE_GROUP) {
-			if (!\OC_Group::groupExists($shareWith)) {
-				$message = 'Sharing '.$itemSourceName.' failed, because the group '.$shareWith.' does not exist';
-				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-				throw new \Exception($message);
-			}
-			if ($sharingPolicy == 'groups_only' && !\OC_Group::inGroup($uidOwner, $shareWith)) {
-				$message = 'Sharing '.$itemSourceName.' failed, because '
-					.$uidOwner.' is not a member of the group '.$shareWith;
-				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-				throw new \Exception($message);
-			}
-			// Check if the item source is already shared with the group, either from the same owner or a different user
-			// The check for each user in the group is done inside the put() function
-			if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_GROUP, $shareWith,
-				null, self::FORMAT_NONE, null, 1, true, true)) {
-				// Only allow the same share to occur again if it is the same
-				// owner and is not a group share, this use case is for increasing
-				// permissions for a specific user
-				if ($checkExists['uid_owner'] != $uidOwner || $checkExists['share_type'] == $shareType) {
-					$message = 'Sharing '.$itemSourceName.' failed, because this item is already shared with '.$shareWith;
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				}
-			}
-			// Convert share with into an array with the keys group and users
-			$group = $shareWith;
-			$shareWith = array();
-			$shareWith['group'] = $group;
-			$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
-		} else if ($shareType === self::SHARE_TYPE_LINK) {
-			if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') {
-				// when updating a link share
-				if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null,
-					$uidOwner, self::FORMAT_NONE, null, 1)) {
-					// remember old token
-					$oldToken = $checkExists['token'];
-					$oldPermissions = $checkExists['permissions'];
-					//delete the old share
-					self::delete($checkExists['id']);
-				}
-
-				// Generate hash of password - same method as user passwords
-				if (isset($shareWith)) {
-					$forcePortable = (CRYPT_BLOWFISH != 1);
-					$hasher = new \PasswordHash(8, $forcePortable);
-					$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
-				} else {
-					// reuse the already set password, but only if we change permissions
-					// otherwise the user disabled the password protection
-					if ($checkExists && (int)$permissions !== (int)$oldPermissions) {
-						$shareWith = $checkExists['share_with'];
-					}
-				}
-
-				// Generate token
-				if (isset($oldToken)) {
-					$token = $oldToken;
-				} else {
-					$token = \OC_Util::generateRandomBytes(self::TOKEN_LENGTH);
-				}
-				$result = self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions,
-					null, $token, $itemSourceName);
-				if ($result) {
-					return $token;
-				} else {
-					return false;
-				}
-			}
-			$message = 'Sharing '.$itemSourceName.' failed, because sharing with links is not allowed';
-			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-			throw new \Exception($message);
-			return false;
-// 		} else if ($shareType === self::SHARE_TYPE_CONTACT) {
-// 			if (!\OC_App::isEnabled('contacts')) {
-// 				$message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled';
-// 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-// 				return false;
-// 			}
-// 			$vcard = \OC_Contacts_App::getContactVCard($shareWith);
-// 			if (!isset($vcard)) {
-// 				$message = 'Sharing '.$itemSource.' failed, because the contact does not exist';
-// 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-// 				throw new \Exception($message);
-// 			}
-// 			$details = \OC_Contacts_VCard::structureContact($vcard);
-// 			// TODO Add ownCloud user to contacts vcard
-// 			if (!isset($details['EMAIL'])) {
-// 				$message = 'Sharing '.$itemSource.' failed, because no email address is associated with the contact';
-// 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-// 				throw new \Exception($message);
-// 			}
-// 			return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions);
-		} else {
-			// Future share types need to include their own conditions
-			$message = 'Share type '.$shareType.' is not valid for '.$itemSource;
-			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-			throw new \Exception($message);
-		}
-		// If the item is a folder, scan through the folder looking for equivalent item types
-// 		if ($itemType == 'folder') {
-// 			$parentFolder = self::put('folder', $itemSource, $shareType, $shareWith, $uidOwner, $permissions, true);
-// 			if ($parentFolder && $files = \OC\Files\Filesystem::getDirectoryContent($itemSource)) {
-// 				for ($i = 0; $i < count($files); $i++) {
-// 					$name = substr($files[$i]['name'], strpos($files[$i]['name'], $itemSource) - strlen($itemSource));
-// 					if ($files[$i]['mimetype'] == 'httpd/unix-directory'
-// 						&& $children = \OC\Files\Filesystem::getDirectoryContent($name, '/')
-// 					) {
-// 						// Continue scanning into child folders
-// 						array_push($files, $children);
-// 					} else {
-// 						// Check file extension for an equivalent item type to convert to
-// 						$extension = strtolower(substr($itemSource, strrpos($itemSource, '.') + 1));
-// 						foreach (self::$backends as $type => $backend) {
-// 							if (isset($backend->dependsOn) && $backend->dependsOn == 'file' && isset($backend->supportedFileExtensions) && in_array($extension, $backend->supportedFileExtensions)) {
-// 								$itemType = $type;
-// 								break;
-// 							}
-// 						}
-// 						// Pass on to put() to check if this item should be converted, the item won't be inserted into the database unless it can be converted
-// 						self::put($itemType, $name, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder);
-// 					}
-// 				}
-// 				return true;
-// 			}
-// 			return false;
-// 		} else {
-			// Put the item into the database
-			return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, null, null, $itemSourceName);
-// 		}
+		return \OC\Share\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions, $itemSourceName);
 	}
 
 	/**
@@ -651,88 +228,32 @@ class Share {
 	 * @param string Item source
 	 * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	 * @param string User or group the item is being shared with
-	 * @return boolean true on success or false on failure
+	 * @return Returns true on success or false on failure
 	 */
 	public static function unshare($itemType, $itemSource, $shareType, $shareWith) {
-		if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith, \OC_User::getUser(),
-			self::FORMAT_NONE, null, 1)) {
-			self::unshareItem($item);
-			return true;
-		}
-		return false;
+		return \OC\Share\Share::unshare($itemType, $itemSource, $shareType, $shareWith);
 	}
 
 	/**
 	 * Unshare an item from all users, groups, and remove all links
 	 * @param string Item type
 	 * @param string Item source
-	 * @param string $itemType
-	 * @param string $itemSource
-	 * @return boolean true on success or false on failure
+	 * @return Returns true on success or false on failure
 	 */
 	public static function unshareAll($itemType, $itemSource) {
-		// Get all of the owners of shares of this item.
-		$query = \OC_DB::prepare( 'SELECT `uid_owner` from `*PREFIX*share` WHERE `item_type`=? AND `item_source`=?' );
-		$result = $query->execute(array($itemType, $itemSource));
-		$shares = array();
-		// Add each owner's shares to the array of all shares for this item.
-		while ($row = $result->fetchRow()) {
-			$shares = array_merge($shares, self::getItems($itemType, $itemSource, null, null, $row['uid_owner']));
-		}
-		if (!empty($shares)) {
-			// Pass all the vars we have for now, they may be useful
-			$hookParams = array(
-				'itemType' => $itemType,
-				'itemSource' => $itemSource,
-				'shares' => $shares,
-			);
-			\OC_Hook::emit('OCP\Share', 'pre_unshareAll', $hookParams);
-			foreach ($shares as $share) {
-				self::unshareItem($share);
-			}
-			\OC_Hook::emit('OCP\Share', 'post_unshareAll', $hookParams);
-			return true;
-		}
-		return false;
+		return \OC\Share\Share::unshareAll($itemType, $itemSource);
 	}
 
 	/**
 	 * Unshare an item shared with the current user
 	 * @param string Item type
 	 * @param string Item target
-	 * @param string $itemType
-	 * @param string $itemTarget
-	 * @return boolean true on success or false on failure
+	 * @return Returns true on success or false on failure
 	 *
 	 * Unsharing from self is not allowed for items inside collections
 	 */
 	public static function unshareFromSelf($itemType, $itemTarget) {
-		if ($item = self::getItemSharedWith($itemType, $itemTarget)) {
-			if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) {
-				// Insert an extra row for the group share and set permission
-				// to 0 to prevent it from showing up for the user
-				$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share`'
-					.' (`item_type`, `item_source`, `item_target`, `parent`, `share_type`,'
-					.' `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`)'
-					.' VALUES (?,?,?,?,?,?,?,?,?,?,?)');
-				$query->execute(array($item['item_type'], $item['item_source'], $item['item_target'],
-					$item['id'], self::$shareTypeGroupUserUnique,
-					\OC_User::getUser(), $item['uid_owner'], 0, $item['stime'], $item['file_source'],
-					$item['file_target']));
-				\OC_DB::insertid('*PREFIX*share');
-				// Delete all reshares by this user of the group share
-				self::delete($item['id'], true, \OC_User::getUser());
-			} else if ((int)$item['share_type'] === self::$shareTypeGroupUserUnique) {
-				// Set permission to 0 to prevent it from showing up for the user
-				$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
-				$query->execute(array(0, $item['id']));
-				self::delete($item['id'], true);
-			} else {
-				self::delete($item['id']);
-			}
-			return true;
-		}
-		return false;
+		return \OC\Share\Share::unshareFromSelf($itemType, $itemTarget);
 	}
 	/**
 	 * sent status if users got informed by mail about share
@@ -742,102 +263,20 @@ class Share {
 	 * @param bool $status
 	 */
 	public static function setSendMailStatus($itemType, $itemSource, $shareType, $status) {
-		$status = $status ? 1 : 0;
-
-		$query = \OC_DB::prepare(
-				'UPDATE `*PREFIX*share`
-					SET `mail_send` = ?
-					WHERE `item_type` = ? AND `item_source` = ? AND `share_type` = ?');
-
-		$result = $query->execute(array($status, $itemType, $itemSource, $shareType));
-
-		if($result === false) {
-			\OC_Log::write('OCP\Share', 'Couldn\'t set send mail status', \OC_Log::ERROR);
-		}
+		return \OC\Share\Share::setSendMailStatus($itemType, $itemSource, $shareType, $status);
 	}
 
 	/**
 	 * Set the permissions of an item for a specific user or group
-	 * @param string $itemType Item type
-	 * @param string $itemSource Item source
-	 * @param int $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
-	 * @param string $shareWith User or group the item is being shared with
-	 * @param integer|null $permissions CRUDS
-	 * @return boolean true on success or false on failure
+	 * @param string Item type
+	 * @param string Item source
+	 * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
+	 * @param string User or group the item is being shared with
+	 * @param int CRUDS permissions
+	 * @return Returns true on success or false on failure
 	 */
 	public static function setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions) {
-		if ($item = self::getItems($itemType, $itemSource, $shareType, $shareWith,
-			\OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
-			// Check if this item is a reshare and verify that the permissions
-			// granted don't exceed the parent shared item
-			if (isset($item['parent'])) {
-				$query = \OC_DB::prepare('SELECT `permissions` FROM `*PREFIX*share` WHERE `id` = ?', 1);
-				$result = $query->execute(array($item['parent']))->fetchRow();
-				if (~(int)$result['permissions'] & $permissions) {
-					$message = 'Setting permissions for '.$itemSource.' failed,'
-						.' because the permissions exceed permissions granted to '.\OC_User::getUser();
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				}
-			}
-			$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
-			$query->execute(array($permissions, $item['id']));
-			if ($itemType === 'file' || $itemType === 'folder') {
-				\OC_Hook::emit('OCP\Share', 'post_update_permissions', array(
-					'itemType' => $itemType,
-					'itemSource' => $itemSource,
-					'shareType' => $shareType,
-					'shareWith' => $shareWith,
-					'uidOwner' => \OC_User::getUser(),
-					'permissions' => $permissions,
-					'path' => $item['path'],
-				));
-			}
-			// Check if permissions were removed
-			if ($item['permissions'] & ~$permissions) {
-				// If share permission is removed all reshares must be deleted
-				if (($item['permissions'] & PERMISSION_SHARE) && (~$permissions & PERMISSION_SHARE)) {
-					self::delete($item['id'], true);
-				} else {
-					$ids = array();
-					$parents = array($item['id']);
-					while (!empty($parents)) {
-						$parents = "'".implode("','", $parents)."'";
-						$query = \OC_DB::prepare('SELECT `id`, `permissions` FROM `*PREFIX*share`'
-							.' WHERE `parent` IN ('.$parents.')');
-						$result = $query->execute();
-						// Reset parents array, only go through loop again if
-						// items are found that need permissions removed
-						$parents = array();
-						while ($item = $result->fetchRow()) {
-							// Check if permissions need to be removed
-							if ($item['permissions'] & ~$permissions) {
-								// Add to list of items that need permissions removed
-								$ids[] = $item['id'];
-								$parents[] = $item['id'];
-							}
-						}
-					}
-					// Remove the permissions for all reshares of this item
-					if (!empty($ids)) {
-						$ids = "'".implode("','", $ids)."'";
-						// TODO this should be done with Doctrine platform objects
-						if (\OC_Config::getValue( "dbtype") === 'oci') {
-							$andOp = 'BITAND(`permissions`, ?)';
-						} else {
-							$andOp = '`permissions` & ?';
-						}
-						$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = '.$andOp
-							.' WHERE `id` IN ('.$ids.')');
-						$query->execute(array($permissions));
-					}
-				}
-			}
-			return true;
-		}
-		$message = 'Setting permissions for '.$itemSource.' failed, because the item was not found';
-		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-		throw new \Exception($message);
+		return \OC\Share\Share::setPermissions($itemType, $itemSource, $shareType, $shareWith, $permissions);
 	}
 
 	/**
@@ -845,67 +284,10 @@ class Share {
 	 * @param string $itemType
 	 * @param string $itemSource
 	 * @param string $date expiration date
-	 * @return boolean
+	 * @return Share_Backend
 	 */
 	public static function setExpirationDate($itemType, $itemSource, $date) {
-		if ($items = self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(),
-			self::FORMAT_NONE, null, -1, false)) {
-			if (!empty($items)) {
-				if ($date == '') {
-					$date = null;
-				} else {
-					$date = new \DateTime($date);
-				}
-				$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `expiration` = ? WHERE `id` = ?');
-				$query->bindValue(1, $date, 'datetime');
-				foreach ($items as $item) {
-					$query->bindValue(2, (int) $item['id']);
-					$query->execute();
-				}
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Checks whether a share has expired, calls unshareItem() if yes.
-	 * @param array $item Share data (usually database row)
-	 * @return bool True if item was expired, false otherwise.
-	 */
-	protected static function expireItem(array $item) {
-		if (!empty($item['expiration'])) {
-			$now = new \DateTime();
-			$expires = new \DateTime($item['expiration']);
-			if ($now > $expires) {
-				self::unshareItem($item);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Unshares a share given a share data array
-	 * @param array $item Share data (usually database row)
-	 * @return null
-	 */
-	protected static function unshareItem(array $item) {
-		// Pass all the vars we have for now, they may be useful
-		$hookParams = array(
-			'itemType'      => $item['item_type'],
-			'itemSource'    => $item['item_source'],
-			'shareType'     => $item['share_type'],
-			'shareWith'     => $item['share_with'],
-			'itemParent'    => $item['parent'],
-			'uidOwner'      => $item['uid_owner'],
-		);
-
-		\OC_Hook::emit('OCP\Share', 'pre_unshare', $hookParams + array(
-			'fileSource'	=> $item['file_source'],
-		));
-		self::delete($item['id']);
-		\OC_Hook::emit('OCP\Share', 'post_unshare', $hookParams);
+		return \OC\Share\Share::setExpirationDate($itemType, $itemSource, $date);
 	}
 
 	/**
@@ -914,1011 +296,14 @@ class Share {
 	 * @return Share_Backend
 	 */
 	public static function getBackend($itemType) {
-		if (isset(self::$backends[$itemType])) {
-			return self::$backends[$itemType];
-		} else if (isset(self::$backendTypes[$itemType]['class'])) {
-			$class = self::$backendTypes[$itemType]['class'];
-			if (class_exists($class)) {
-				self::$backends[$itemType] = new $class;
-				if (!(self::$backends[$itemType] instanceof Share_Backend)) {
-					$message = 'Sharing backend '.$class.' must implement the interface OCP\Share_Backend';
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				}
-				return self::$backends[$itemType];
-			} else {
-				$message = 'Sharing backend '.$class.' not found';
-				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-				throw new \Exception($message);
-			}
-		}
-		$message = 'Sharing backend for '.$itemType.' not found';
-		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-		throw new \Exception($message);
-	}
-
-	/**
-	 * Check if resharing is allowed
-	 * @return boolean true if allowed or false
-	 *
-	 * Resharing is allowed by default if not configured
-	 */
-	private static function isResharingAllowed() {
-		if (!isset(self::$isResharingAllowed)) {
-			if (\OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes') == 'yes') {
-				self::$isResharingAllowed = true;
-			} else {
-				self::$isResharingAllowed = false;
-			}
-		}
-		return self::$isResharingAllowed;
-	}
-
-	/**
-	 * Get a list of collection item types for the specified item type
-	 * @param string Item type
-	 * @return array
-	 */
-	private static function getCollectionItemTypes($itemType) {
-		$collectionTypes = array($itemType);
-		foreach (self::$backendTypes as $type => $backend) {
-			if (in_array($backend['collectionOf'], $collectionTypes)) {
-				$collectionTypes[] = $type;
-			}
-		}
-		// TODO Add option for collections to be collection of themselves, only 'folder' does it now...
-		if (!self::getBackend($itemType) instanceof Share_Backend_Collection || $itemType != 'folder') {
-			unset($collectionTypes[0]);
-		}
-		// Return array if collections were found or the item type is a
-		// collection itself - collections can be inside collections
-		if (count($collectionTypes) > 0) {
-			return $collectionTypes;
-		}
-		return false;
-	}
-
-	/**
-	 * Get shared items from the database
-	 * @param string Item type
-	 * @param string Item source or target (optional)
-	 * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
-	 * @param string User or group the item is being shared with
-	 * @param string User that is the owner of shared items (optional)
-	 * @param int Format to convert items to with formatItems()
-	 * @param mixed Parameters to pass to formatItems()
-	 * @param int Number of items to return, -1 to return all matches (optional)
-	 * @param bool Include collection item types (optional)
-	 * @param bool TODO (optional)
-	 * @prams bool check expire date
-	 * @return mixed
-	 *
-	 * See public functions getItem(s)... for parameter usage
-	 *
-	 */
-	private static function getItems($itemType, $item = null, $shareType = null, $shareWith = null,
-		$uidOwner = null, $format = self::FORMAT_NONE, $parameters = null, $limit = -1,
-		$includeCollections = false, $itemShareWithBySource = false, $checkExpireDate  = true) {
-		if (!self::isEnabled()) {
-			if ($limit == 1 || (isset($uidOwner) && isset($item))) {
-				return false;
-			} else {
-				return array();
-			}
-		}
-		$backend = self::getBackend($itemType);
-		$collectionTypes = false;
-		// Get filesystem root to add it to the file target and remove from the
-		// file source, match file_source with the file cache
-		if ($itemType == 'file' || $itemType == 'folder') {
-			if(!is_null($uidOwner)) {
-				$root = \OC\Files\Filesystem::getRoot();
-			} else {
-				$root = '';
-			}
-			$where = 'INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid`';
-			if (!isset($item)) {
-				$where .= ' WHERE `file_target` IS NOT NULL';
-			}
-			$fileDependent = true;
-			$queryArgs = array();
-		} else {
-			$fileDependent = false;
-			$root = '';
-			if ($includeCollections && !isset($item) && ($collectionTypes = self::getCollectionItemTypes($itemType))) {
-				// If includeCollections is true, find collections of this item type, e.g. a music album contains songs
-				if (!in_array($itemType, $collectionTypes)) {
-					$itemTypes = array_merge(array($itemType), $collectionTypes);
-				} else {
-					$itemTypes = $collectionTypes;
-				}
-				$placeholders = join(',', array_fill(0, count($itemTypes), '?'));
-				$where = ' WHERE `item_type` IN ('.$placeholders.'))';
-				$queryArgs = $itemTypes;
-			} else {
-				$where = ' WHERE `item_type` = ?';
-				$queryArgs = array($itemType);
-			}
-		}
-		if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
-			$where .= ' AND `share_type` != ?';
-			$queryArgs[] = self::SHARE_TYPE_LINK;
-		}
-		if (isset($shareType)) {
-			// Include all user and group items
-			if ($shareType == self::$shareTypeUserAndGroups && isset($shareWith)) {
-				$where .= ' AND `share_type` IN (?,?,?)';
-				$queryArgs[] = self::SHARE_TYPE_USER;
-				$queryArgs[] = self::SHARE_TYPE_GROUP;
-				$queryArgs[] = self::$shareTypeGroupUserUnique;
-				$userAndGroups = array_merge(array($shareWith), \OC_Group::getUserGroups($shareWith));
-				$placeholders = join(',', array_fill(0, count($userAndGroups), '?'));
-				$where .= ' AND `share_with` IN ('.$placeholders.')';
-				$queryArgs = array_merge($queryArgs, $userAndGroups);
-				// Don't include own group shares
-				$where .= ' AND `uid_owner` != ?';
-				$queryArgs[] = $shareWith;
-			} else {
-				$where .= ' AND `share_type` = ?';
-				$queryArgs[] = $shareType;
-				if (isset($shareWith)) {
-					$where .= ' AND `share_with` = ?';
-					$queryArgs[] = $shareWith;
-				}
-			}
-		}
-		if (isset($uidOwner)) {
-			$where .= ' AND `uid_owner` = ?';
-			$queryArgs[] = $uidOwner;
-			if (!isset($shareType)) {
-				// Prevent unique user targets for group shares from being selected
-				$where .= ' AND `share_type` != ?';
-				$queryArgs[] = self::$shareTypeGroupUserUnique;
-			}
-			if ($itemType == 'file' || $itemType == 'folder') {
-				$column = 'file_source';
-			} else {
-				$column = 'item_source';
-			}
-		} else {
-			if ($itemType == 'file' || $itemType == 'folder') {
-				$column = 'file_target';
-			} else {
-				$column = 'item_target';
-			}
-		}
-		if (isset($item)) {
-			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
-				$where .= ' AND (';
-			} else {
-				$where .= ' AND';
-			}
-			// If looking for own shared items, check item_source else check item_target
-			if (isset($uidOwner) || $itemShareWithBySource) {
-				// If item type is a file, file source needs to be checked in case the item was converted
-				if ($itemType == 'file' || $itemType == 'folder') {
-					$where .= ' `file_source` = ?';
-					$column = 'file_source';
-				} else {
-					$where .= ' `item_source` = ?';
-					$column = 'item_source';
-				}
-			} else {
-				if ($itemType == 'file' || $itemType == 'folder') {
-					$where .= ' `file_target` = ?';
-					$item = \OC\Files\Filesystem::normalizePath($item);
-				} else {
-					$where .= ' `item_target` = ?';
-				}
-			}
-			$queryArgs[] = $item;
-			if ($includeCollections && $collectionTypes) {
-				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
-				$where .= ' OR `item_type` IN ('.$placeholders.'))';
-				$queryArgs = array_merge($queryArgs, $collectionTypes);
-			}
-		}
-		if ($limit != -1 && !$includeCollections) {
-			if ($shareType == self::$shareTypeUserAndGroups) {
-				// Make sure the unique user target is returned if it exists,
-				// unique targets should follow the group share in the database
-				// If the limit is not 1, the filtering can be done later
-				$where .= ' ORDER BY `*PREFIX*share`.`id` DESC';
-			}
-			// The limit must be at least 3, because filtering needs to be done
-			if ($limit < 3) {
-				$queryLimit = 3;
-			} else {
-				$queryLimit = $limit;
-			}
-		} else {
-			$queryLimit = null;
-		}
-		// TODO Optimize selects
-		if ($format == self::FORMAT_STATUSES) {
-			if ($itemType == 'file' || $itemType == 'folder') {
-				$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `*PREFIX*share`.`parent`,'
-					.' `share_type`, `file_source`, `path`, `expiration`, `storage`, `share_with`, `mail_send`, `uid_owner`';
-			} else {
-				$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `expiration`, `mail_send`, `uid_owner`';
-			}
-		} else {
-			if (isset($uidOwner)) {
-				if ($itemType == 'file' || $itemType == 'folder') {
-					$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `*PREFIX*share`.`parent`,'
-						.' `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`,'
-						.' `expiration`, `token`, `storage`, `mail_send`, `uid_owner`';
-				} else {
-					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`,'
-						.' `stime`, `file_source`, `expiration`, `token`, `mail_send`, `uid_owner`';
-				}
-			} else {
-				if ($fileDependent) {
-					if (($itemType == 'file' || $itemType == 'folder')
-						&& $format == \OC_Share_Backend_File::FORMAT_GET_FOLDER_CONTENTS
-						|| $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT
-					) {
-						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `*PREFIX*share`.`parent`, `uid_owner`, '
-							.'`share_type`, `share_with`, `file_source`, `path`, `file_target`, '
-							.'`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, '
-							.'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `unencrypted_size`, `encrypted`, `etag`, `mail_send`';
-					} else {
-						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`,
-							`*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`,
-							`file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`, `storage`, `mail_send`';
-					}
-				} else {
-					$select = '*';
-				}
-			}
-		}
-		$root = strlen($root);
-		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
-		$result = $query->execute($queryArgs);
-		if (\OC_DB::isError($result)) {
-			\OC_Log::write('OCP\Share',
-				\OC_DB::getErrorMessage($result) . ', select=' . $select . ' where=' . $where,
-				\OC_Log::ERROR);
-		}
-		$items = array();
-		$targets = array();
-		$switchedItems = array();
-		$mounts = array();
-		while ($row = $result->fetchRow()) {
-			if (isset($row['id'])) {
-				$row['id']=(int)$row['id'];
-			}
-			if (isset($row['share_type'])) {
-				$row['share_type']=(int)$row['share_type'];
-			}
-			if (isset($row['parent'])) {
-				$row['parent']=(int)$row['parent'];
-			}
-			if (isset($row['file_parent'])) {
-				$row['file_parent']=(int)$row['file_parent'];
-			}
-			if (isset($row['file_source'])) {
-				$row['file_source']=(int)$row['file_source'];
-			}
-			if (isset($row['permissions'])) {
-				$row['permissions']=(int)$row['permissions'];
-			}
-			if (isset($row['storage'])) {
-				$row['storage']=(int)$row['storage'];
-			}
-			if (isset($row['stime'])) {
-				$row['stime']=(int)$row['stime'];
-			}
-			// Filter out duplicate group shares for users with unique targets
-			if ($row['share_type'] == self::$shareTypeGroupUserUnique && isset($items[$row['parent']])) {
-				$row['share_type'] = self::SHARE_TYPE_GROUP;
-				$row['share_with'] = $items[$row['parent']]['share_with'];
-				// Remove the parent group share
-				unset($items[$row['parent']]);
-				if ($row['permissions'] == 0) {
-					continue;
-				}
-			} else if (!isset($uidOwner)) {
-				// Check if the same target already exists
-				if (isset($targets[$row[$column]])) {
-					// Check if the same owner shared with the user twice
-					// through a group and user share - this is allowed
-					$id = $targets[$row[$column]];
-					if (isset($items[$id]) && $items[$id]['uid_owner'] == $row['uid_owner']) {
-						// Switch to group share type to ensure resharing conditions aren't bypassed
-						if ($items[$id]['share_type'] != self::SHARE_TYPE_GROUP) {
-							$items[$id]['share_type'] = self::SHARE_TYPE_GROUP;
-							$items[$id]['share_with'] = $row['share_with'];
-						}
-						// Switch ids if sharing permission is granted on only
-						// one share to ensure correct parent is used if resharing
-						if (~(int)$items[$id]['permissions'] & PERMISSION_SHARE
-							&& (int)$row['permissions'] & PERMISSION_SHARE) {
-							$items[$row['id']] = $items[$id];
-							$switchedItems[$id] = $row['id'];
-							unset($items[$id]);
-							$id = $row['id'];
-						}
-						// Combine the permissions for the item
-						$items[$id]['permissions'] |= (int)$row['permissions'];
-						continue;
-					}
-				} else {
-					$targets[$row[$column]] = $row['id'];
-				}
-			}
-			// Remove root from file source paths if retrieving own shared items
-			if (isset($uidOwner) && isset($row['path'])) {
-				if (isset($row['parent'])) {
-					$query = \OC_DB::prepare('SELECT `file_target` FROM `*PREFIX*share` WHERE `id` = ?');
-					$parentResult = $query->execute(array($row['parent']));
-					if (\OC_DB::isError($result)) {
-						\OC_Log::write('OCP\Share', 'Can\'t select parent: ' .
-								\OC_DB::getErrorMessage($result) . ', select=' . $select . ' where=' . $where,
-								\OC_Log::ERROR);
-					} else {
-						$parentRow = $parentResult->fetchRow();
-						$splitPath = explode('/', $row['path']);
-						$tmpPath = '/Shared' . $parentRow['file_target'];
-						foreach (array_slice($splitPath, 2) as $pathPart) {
-							$tmpPath = $tmpPath . '/' . $pathPart;
-						}
-						$row['path'] =  $tmpPath;
-					}
-				} else {
-					if (!isset($mounts[$row['storage']])) {
-						$mountPoints = \OC\Files\Filesystem::getMountByNumericId($row['storage']);
-						if (is_array($mountPoints)) {
-							$mounts[$row['storage']] = current($mountPoints);
-						}
-					}
-					if ($mounts[$row['storage']]) {
-						$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
-						$row['path'] = substr($path, $root);
-					}
-				}
-			}
-			if($checkExpireDate) {
-				if (self::expireItem($row)) {
-					continue;
-				}
-			}
-			// Check if resharing is allowed, if not remove share permission
-			if (isset($row['permissions']) && !self::isResharingAllowed()) {
-				$row['permissions'] &= ~PERMISSION_SHARE;
-			}
-			// Add display names to result
-			if ( isset($row['share_with']) && $row['share_with'] != '') {
-				$row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']);
-			}
-			if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
-				$row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']);
-			}
-
-			$items[$row['id']] = $row;
-		}
-		if (!empty($items)) {
-			$collectionItems = array();
-			foreach ($items as &$row) {
-				// Return only the item instead of a 2-dimensional array
-				if ($limit == 1 && $row[$column] == $item && ($row['item_type'] == $itemType || $itemType == 'file')) {
-					if ($format == self::FORMAT_NONE) {
-						return $row;
-					} else {
-						break;
-					}
-				}
-				// Check if this is a collection of the requested item type
-				if ($includeCollections && $collectionTypes && in_array($row['item_type'], $collectionTypes)) {
-					if (($collectionBackend = self::getBackend($row['item_type']))
-						&& $collectionBackend instanceof Share_Backend_Collection) {
-						// Collections can be inside collections, check if the item is a collection
-						if (isset($item) && $row['item_type'] == $itemType && $row[$column] == $item) {
-							$collectionItems[] = $row;
-						} else {
-							$collection = array();
-							$collection['item_type'] = $row['item_type'];
-							if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') {
-								$collection['path'] = basename($row['path']);
-							}
-							$row['collection'] = $collection;
-							// Fetch all of the children sources
-							$children = $collectionBackend->getChildren($row[$column]);
-							foreach ($children as $child) {
-								$childItem = $row;
-								$childItem['item_type'] = $itemType;
-								if ($row['item_type'] != 'file' && $row['item_type'] != 'folder') {
-									$childItem['item_source'] = $child['source'];
-									$childItem['item_target'] = $child['target'];
-								}
-								if ($backend instanceof Share_Backend_File_Dependent) {
-									if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') {
-										$childItem['file_source'] = $child['source'];
-									} else {
-										$meta = \OC\Files\Filesystem::getFileInfo($child['file_path']);
-										$childItem['file_source'] = $meta['fileid'];
-									}
-									$childItem['file_target'] =
-										\OC\Files\Filesystem::normalizePath($child['file_path']);
-								}
-								if (isset($item)) {
-									if ($childItem[$column] == $item) {
-										// Return only the item instead of a 2-dimensional array
-										if ($limit == 1) {
-											if ($format == self::FORMAT_NONE) {
-												return $childItem;
-											} else {
-												// Unset the items array and break out of both loops
-												$items = array();
-												$items[] = $childItem;
-												break 2;
-											}
-										} else {
-											$collectionItems[] = $childItem;
-										}
-									}
-								} else {
-									$collectionItems[] = $childItem;
-								}
-							}
-						}
-					}
-					// Remove collection item
-					$toRemove = $row['id'];
-					if (array_key_exists($toRemove, $switchedItems)) {
-						$toRemove = $switchedItems[$toRemove];
-					}
-					unset($items[$toRemove]);
-				}
-			}
-			if (!empty($collectionItems)) {
-				$items = array_merge($items, $collectionItems);
-			}
-			if (empty($items) && $limit == 1) {
-				return false;
-			}
-			if ($format == self::FORMAT_NONE) {
-				return $items;
-			} else if ($format == self::FORMAT_STATUSES) {
-				$statuses = array();
-				foreach ($items as $item) {
-					if ($item['share_type'] == self::SHARE_TYPE_LINK) {
-						$statuses[$item[$column]]['link'] = true;
-					} else if (!isset($statuses[$item[$column]])) {
-						$statuses[$item[$column]]['link'] = false;
-					}
-					if ($itemType == 'file' || $itemType == 'folder') {
-						$statuses[$item[$column]]['path'] = $item['path'];
-					}
-				}
-				return $statuses;
-			} else {
-				return $backend->formatItems($items, $format, $parameters);
-			}
-		} else if ($limit == 1 || (isset($uidOwner) && isset($item))) {
-			return false;
-		}
-		return array();
-	}
-
-	/**
-	 * Put shared item into the database
-	 * @param string $itemType Item type
-	 * @param string $itemSource Item source
-	 * @param integer $shareType SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
-	 * @param string $shareWith User or group the item is being shared with
-	 * @param string $uidOwner User that is the owner of shared item
-	 * @param int $permissions CRUDS permissions
-	 * @param bool|array, $parentFolder Parent folder target (optional)
-	 * @param string $token (optional)
-	 * @param string $itemSourceName name of the source item (optional)
-	 * @return bool Returns true on success or false on failure
-	 */
-	private static function put($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
-		$permissions, $parentFolder = null, $token = null, $itemSourceName = null) {
-		$backend = self::getBackend($itemType);
-
-		// Check if this is a reshare
-		if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
-
-			// Check if attempting to share back to owner
-			if ($checkReshare['uid_owner'] == $shareWith && $shareType == self::SHARE_TYPE_USER) {
-				$message = 'Sharing '.$itemSourceName.' failed, because the user '.$shareWith.' is the original sharer';
-				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-				throw new \Exception($message);
-			}
-			// Check if share permissions is granted
-			if (self::isResharingAllowed() && (int)$checkReshare['permissions'] & PERMISSION_SHARE) {
-				if (~(int)$checkReshare['permissions'] & $permissions) {
-					$message = 'Sharing '.$itemSourceName
-						.' failed, because the permissions exceed permissions granted to '.$uidOwner;
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				} else {
-					// TODO Don't check if inside folder
-					$parent = $checkReshare['id'];
-					$itemSource = $checkReshare['item_source'];
-					$fileSource = $checkReshare['file_source'];
-					$suggestedItemTarget = $checkReshare['item_target'];
-					$suggestedFileTarget = $checkReshare['file_target'];
-					$filePath = $checkReshare['file_target'];
-				}
-			} else {
-				$message = 'Sharing '.$itemSourceName.' failed, because resharing is not allowed';
-				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-				throw new \Exception($message);
-			}
-		} else {
-			$parent = null;
-			$suggestedItemTarget = null;
-			$suggestedFileTarget = null;
-			if (!$backend->isValidSource($itemSource, $uidOwner)) {
-				$message = 'Sharing '.$itemSource.' failed, because the sharing backend for '
-					.$itemType.' could not find its source';
-				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-				throw new \Exception($message);
-			}
-			$parent = null;
-			if ($backend instanceof Share_Backend_File_Dependent) {
-				$filePath = $backend->getFilePath($itemSource, $uidOwner);
-				if ($itemType == 'file' || $itemType == 'folder') {
-					$fileSource = $itemSource;
-				} else {
-					$meta = \OC\Files\Filesystem::getFileInfo($filePath);
-					$fileSource = $meta['fileid'];
-				}
-				if ($fileSource == -1) {
-					$message = 'Sharing '.$itemSource.' failed, because the file could not be found in the file cache';
-					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-					throw new \Exception($message);
-				}
-			} else {
-				$filePath = null;
-				$fileSource = null;
-			}
-		}
-		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`,'
-			.' `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`,'
-			.' `file_target`, `token`) VALUES (?,?,?,?,?,?,?,?,?,?,?,?)');
-		// Share with a group
-		if ($shareType == self::SHARE_TYPE_GROUP) {
-			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'],
-				$uidOwner, $suggestedItemTarget);
-			$run = true;
-			$error = '';
-			\OC_Hook::emit('OCP\Share', 'pre_shared', array(
-				'itemType' => $itemType,
-				'itemSource' => $itemSource,
-				'itemTarget' => $groupItemTarget,
-				'shareType' => $shareType,
-				'shareWith' => $shareWith['group'],
-				'uidOwner' => $uidOwner,
-				'permissions' => $permissions,
-				'fileSource' => $fileSource,
-				'token' => $token,
-				'run' => &$run,
-				'error' => &$error
-			));
-
-			if ($run === false) {
-				throw new \Exception($error);
-			}
-
-			if (isset($fileSource)) {
-				if ($parentFolder) {
-					if ($parentFolder === true) {
-						$groupFileTarget = self::generateTarget('file', $filePath, $shareType,
-							$shareWith['group'], $uidOwner, $suggestedFileTarget);
-						// Set group default file target for future use
-						$parentFolders[0]['folder'] = $groupFileTarget;
-					} else {
-						// Get group default file target
-						$groupFileTarget = $parentFolder[0]['folder'].$itemSource;
-						$parent = $parentFolder[0]['id'];
-					}
-				} else {
-					$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group'],
-						$uidOwner, $suggestedFileTarget);
-				}
-			} else {
-				$groupFileTarget = null;
-			}
-			$query->execute(array($itemType, $itemSource, $groupItemTarget, $parent, $shareType,
-				$shareWith['group'], $uidOwner, $permissions, time(), $fileSource, $groupFileTarget, $token));
-			// Save this id, any extra rows for this group share will need to reference it
-			$parent = \OC_DB::insertid('*PREFIX*share');
-			// Loop through all users of this group in case we need to add an extra row
-			foreach ($shareWith['users'] as $uid) {
-				$itemTarget = self::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid,
-					$uidOwner, $suggestedItemTarget, $parent);
-				if (isset($fileSource)) {
-					if ($parentFolder) {
-						if ($parentFolder === true) {
-							$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid,
-								$uidOwner, $suggestedFileTarget, $parent);
-							if ($fileTarget != $groupFileTarget) {
-								$parentFolders[$uid]['folder'] = $fileTarget;
-							}
-						} else if (isset($parentFolder[$uid])) {
-							$fileTarget = $parentFolder[$uid]['folder'].$itemSource;
-							$parent = $parentFolder[$uid]['id'];
-						}
-					} else {
-						$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER,
-							$uid, $uidOwner, $suggestedFileTarget, $parent);
-					}
-				} else {
-					$fileTarget = null;
-				}
-				// Insert an extra row for the group share if the item or file target is unique for this user
-				if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) {
-					$query->execute(array($itemType, $itemSource, $itemTarget, $parent,
-						self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(),
-							$fileSource, $fileTarget, $token));
-					$id = \OC_DB::insertid('*PREFIX*share');
-				}
-			}
-			\OC_Hook::emit('OCP\Share', 'post_shared', array(
-				'itemType' => $itemType,
-				'itemSource' => $itemSource,
-				'itemTarget' => $groupItemTarget,
-				'parent' => $parent,
-				'shareType' => $shareType,
-				'shareWith' => $shareWith['group'],
-				'uidOwner' => $uidOwner,
-				'permissions' => $permissions,
-				'fileSource' => $fileSource,
-				'fileTarget' => $groupFileTarget,
-				'id' => $parent,
-				'token' => $token
-			));
-
-			if ($parentFolder === true) {
-				// Return parent folders to preserve file target paths for potential children
-				return $parentFolders;
-			}
-		} else {
-			$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
-				$suggestedItemTarget);
-			$run = true;
-			$error = '';
-			\OC_Hook::emit('OCP\Share', 'pre_shared', array(
-				'itemType' => $itemType,
-				'itemSource' => $itemSource,
-				'itemTarget' => $itemTarget,
-				'shareType' => $shareType,
-				'shareWith' => $shareWith,
-				'uidOwner' => $uidOwner,
-				'permissions' => $permissions,
-				'fileSource' => $fileSource,
-				'token' => $token,
-				'run' => &$run,
-				'error' => &$error
-			));
-
-			if ($run === false) {
-				throw new \Exception($error);
-			}
-
-			if (isset($fileSource)) {
-				if ($parentFolder) {
-					if ($parentFolder === true) {
-						$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith,
-							$uidOwner, $suggestedFileTarget);
-						$parentFolders['folder'] = $fileTarget;
-					} else {
-						$fileTarget = $parentFolder['folder'].$itemSource;
-						$parent = $parentFolder['id'];
-					}
-				} else {
-					$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith, $uidOwner,
-						$suggestedFileTarget);
-				}
-			} else {
-				$fileTarget = null;
-			}
-			$query->execute(array($itemType, $itemSource, $itemTarget, $parent, $shareType, $shareWith, $uidOwner,
-				$permissions, time(), $fileSource, $fileTarget, $token));
-			$id = \OC_DB::insertid('*PREFIX*share');
-			\OC_Hook::emit('OCP\Share', 'post_shared', array(
-				'itemType' => $itemType,
-				'itemSource' => $itemSource,
-				'itemTarget' => $itemTarget,
-				'parent' => $parent,
-				'shareType' => $shareType,
-				'shareWith' => $shareWith,
-				'uidOwner' => $uidOwner,
-				'permissions' => $permissions,
-				'fileSource' => $fileSource,
-				'fileTarget' => $fileTarget,
-				'id' => $id,
-				'token' => $token
-			));
-			if ($parentFolder === true) {
-				$parentFolders['id'] = $id;
-				// Return parent folder to preserve file target paths for potential children
-				return $parentFolders;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Generate a unique target for the item
-	 * @param string Item type
-	 * @param string Item source
-	 * @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
-	 * @param string User or group the item is being shared with
-	 * @param string User that is the owner of shared item
-	 * @param string The suggested target originating from a reshare (optional)
-	 * @param int The id of the parent group share (optional)
-	 * @param integer $shareType
-	 * @return string Item target
-	 */
-	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner,
-		$suggestedTarget = null, $groupParent = null) {
-		$backend = self::getBackend($itemType);
-		if ($shareType == self::SHARE_TYPE_LINK) {
-			if (isset($suggestedTarget)) {
-				return $suggestedTarget;
-			}
-			return $backend->generateTarget($itemSource, false);
-		} else {
-			if ($itemType == 'file' || $itemType == 'folder') {
-				$column = 'file_target';
-				$columnSource = 'file_source';
-			} else {
-				$column = 'item_target';
-				$columnSource = 'item_source';
-			}
-			if ($shareType == self::SHARE_TYPE_USER) {
-				// Share with is a user, so set share type to user and groups
-				$shareType = self::$shareTypeUserAndGroups;
-				$userAndGroups = array_merge(array($shareWith), \OC_Group::getUserGroups($shareWith));
-			} else {
-				$userAndGroups = false;
-			}
-			$exclude = null;
-			// Backend has 3 opportunities to generate a unique target
-			for ($i = 0; $i < 2; $i++) {
-				// Check if suggested target exists first
-				if ($i == 0 && isset($suggestedTarget)) {
-					$target = $suggestedTarget;
-				} else {
-					if ($shareType == self::SHARE_TYPE_GROUP) {
-						$target = $backend->generateTarget($itemSource, false, $exclude);
-					} else {
-						$target = $backend->generateTarget($itemSource, $shareWith, $exclude);
-					}
-					if (is_array($exclude) && in_array($target, $exclude)) {
-						break;
-					}
-				}
-				// Check if target already exists
-				$checkTarget = self::getItems($itemType, $target, $shareType, $shareWith);
-				if (!empty($checkTarget)) {
-					foreach ($checkTarget as $item) {
-						// Skip item if it is the group parent row
-						if (isset($groupParent) && $item['id'] == $groupParent) {
-							if (count($checkTarget) == 1) {
-								return $target;
-							} else {
-								continue;
-							}
-						}
-						if ($item['uid_owner'] == $uidOwner) {
-							if ($itemType == 'file' || $itemType == 'folder') {
-								$meta = \OC\Files\Filesystem::getFileInfo($itemSource);
-								if ($item['file_source'] == $meta['fileid']) {
-									return $target;
-								}
-							} else if ($item['item_source'] == $itemSource) {
-								return $target;
-							}
-						}
-					}
-					if (!isset($exclude)) {
-						$exclude = array();
-					}
-					// Find similar targets to improve backend's chances to generate a unqiue target
-					if ($userAndGroups) {
-						if ($column == 'file_target') {
-							$checkTargets = \OC_DB::prepare('SELECT `'.$column.'` FROM `*PREFIX*share`'
-								.' WHERE `item_type` IN (\'file\', \'folder\')'
-								.' AND `share_type` IN (?,?,?)'
-								.' AND `share_with` IN (\''.implode('\',\'', $userAndGroups).'\')');
-							$result = $checkTargets->execute(array(self::SHARE_TYPE_USER, self::SHARE_TYPE_GROUP,
-								self::$shareTypeGroupUserUnique));
-						} else {
-							$checkTargets = \OC_DB::prepare('SELECT `'.$column.'` FROM `*PREFIX*share`'
-								.' WHERE `item_type` = ? AND `share_type` IN (?,?,?)'
-								.' AND `share_with` IN (\''.implode('\',\'', $userAndGroups).'\')');
-							$result = $checkTargets->execute(array($itemType, self::SHARE_TYPE_USER,
-								self::SHARE_TYPE_GROUP, self::$shareTypeGroupUserUnique));
-						}
-					} else {
-						if ($column == 'file_target') {
-							$checkTargets = \OC_DB::prepare('SELECT `'.$column.'` FROM `*PREFIX*share`'
-								.' WHERE `item_type` IN (\'file\', \'folder\')'
-								.' AND `share_type` = ? AND `share_with` = ?');
-							$result = $checkTargets->execute(array(self::SHARE_TYPE_GROUP, $shareWith));
-						} else {
-							$checkTargets = \OC_DB::prepare('SELECT `'.$column.'` FROM `*PREFIX*share`'
-								.' WHERE `item_type` = ? AND `share_type` = ? AND `share_with` = ?');
-							$result = $checkTargets->execute(array($itemType, self::SHARE_TYPE_GROUP, $shareWith));
-						}
-					}
-					while ($row = $result->fetchRow()) {
-						$exclude[] = $row[$column];
-					}
-				} else {
-					return $target;
-				}
-			}
-		}
-		$message = 'Sharing backend registered for '.$itemType.' did not generate a unique target for '.$itemSource;
-		\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
-		throw new \Exception($message);
-	}
-
-	/**
-	 * Delete all reshares of an item
-	 * @param int Id of item to delete
-	 * @param bool If true, exclude the parent from the delete (optional)
-	 * @param string The user that the parent was shared with (optinal)
-	 */
-	private static function delete($parent, $excludeParent = false, $uidOwner = null) {
-		$ids = array($parent);
-		$parents = array($parent);
-		while (!empty($parents)) {
-			$parents = "'".implode("','", $parents)."'";
-			// Check the owner on the first search of reshares, useful for
-			// finding and deleting the reshares by a single user of a group share
-			if (count($ids) == 1 && isset($uidOwner)) {
-				$query = \OC_DB::prepare('SELECT `id`, `uid_owner`, `item_type`, `item_target`, `parent`'
-					.' FROM `*PREFIX*share` WHERE `parent` IN ('.$parents.') AND `uid_owner` = ?');
-				$result = $query->execute(array($uidOwner));
-			} else {
-				$query = \OC_DB::prepare('SELECT `id`, `item_type`, `item_target`, `parent`, `uid_owner`'
-					.' FROM `*PREFIX*share` WHERE `parent` IN ('.$parents.')');
-				$result = $query->execute();
-			}
-			// Reset parents array, only go through loop again if items are found
-			$parents = array();
-			while ($item = $result->fetchRow()) {
-				// Search for a duplicate parent share, this occurs when an
-				// item is shared to the same user through a group and user or the
-				// same item is shared by different users
-				$userAndGroups = array_merge(array($item['uid_owner']), \OC_Group::getUserGroups($item['uid_owner']));
-				$query = \OC_DB::prepare('SELECT `id`, `permissions` FROM `*PREFIX*share`'
-					.' WHERE `item_type` = ?'
-					.' AND `item_target` = ?'
-					.' AND `share_type` IN (?,?,?)'
-					.' AND `share_with` IN (\''.implode('\',\'', $userAndGroups).'\')'
-					.' AND `uid_owner` != ? AND `id` != ?');
-				$duplicateParent = $query->execute(array($item['item_type'], $item['item_target'],
-					self::SHARE_TYPE_USER, self::SHARE_TYPE_GROUP, self::$shareTypeGroupUserUnique,
-					$item['uid_owner'], $item['parent']))->fetchRow();
-				if ($duplicateParent) {
-					// Change the parent to the other item id if share permission is granted
-					if ($duplicateParent['permissions'] & PERMISSION_SHARE) {
-						$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `parent` = ? WHERE `id` = ?');
-						$query->execute(array($duplicateParent['id'], $item['id']));
-						continue;
-					}
-				}
-				$ids[] = $item['id'];
-				$parents[] = $item['id'];
-			}
-		}
-		if ($excludeParent) {
-			unset($ids[0]);
-		}
-		if (!empty($ids)) {
-			$ids = "'".implode("','", $ids)."'";
-			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `id` IN ('.$ids.')');
-			$query->execute();
-		}
+		return \OC\Share\Share::getBackend($itemType);
 	}
 
 	/**
 	 * Delete all shares with type SHARE_TYPE_LINK
 	 */
 	public static function removeAllLinkShares() {
-		// Delete any link shares
-		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*share` WHERE `share_type` = ?');
-		$result = $query->execute(array(self::SHARE_TYPE_LINK));
-		while ($item = $result->fetchRow()) {
-			self::delete($item['id']);
-		}
-	}
-
-	/**
-	 * Hook Listeners
-	 */
-
-	/**
-	 * Function that is called after a user is deleted. Cleans up the shares of that user.
-	 * @param array arguments
-	 */
-	public static function post_deleteUser($arguments) {
-		// Delete any items shared with the deleted user
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share`'
-			.' WHERE `share_with` = ? AND `share_type` = ? OR `share_type` = ?');
-		$result = $query->execute(array($arguments['uid'], self::SHARE_TYPE_USER, self::$shareTypeGroupUserUnique));
-		// Delete any items the deleted user shared
-		$query = \OC_DB::prepare('SELECT `id` FROM `*PREFIX*share` WHERE `uid_owner` = ?');
-		$result = $query->execute(array($arguments['uid']));
-		while ($item = $result->fetchRow()) {
-			self::delete($item['id']);
-		}
-	}
-
-	/**
-	 * Function that is called after a user is added to a group.
-	 * TODO what does it do?
-	 * @param array arguments
-	 */
-	public static function post_addToGroup($arguments) {
-		// Find the group shares and check if the user needs a unique target
-		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?');
-		$result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid']));
-		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`,'
-			.' `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`,'
-			.' `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)');
-		while ($item = $result->fetchRow()) {
-			if ($item['item_type'] == 'file' || $item['item_type'] == 'file') {
-				$itemTarget = null;
-			} else {
-				$itemTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
-					$arguments['uid'], $item['uid_owner'], $item['item_target'], $item['id']);
-			}
-			if (isset($item['file_source'])) {
-				$fileTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER,
-					$arguments['uid'], $item['uid_owner'], $item['file_target'], $item['id']);
-			} else {
-				$fileTarget = null;
-			}
-			// Insert an extra row for the group share if the item or file target is unique for this user
-			if ($itemTarget != $item['item_target'] || $fileTarget != $item['file_target']) {
-				$query->execute(array($item['item_type'], $item['item_source'], $itemTarget, $item['id'],
-					self::$shareTypeGroupUserUnique, $arguments['uid'], $item['uid_owner'], $item['permissions'],
-					$item['stime'], $item['file_source'], $fileTarget));
-				\OC_DB::insertid('*PREFIX*share');
-			}
-		}
-	}
-
-	/**
-	 * Function that is called after a user is removed from a group. Shares are cleaned up.
-	 * @param array arguments
-	 */
-	public static function post_removeFromGroup($arguments) {
-		// TODO Don't call if user deleted?
-		$sql = 'SELECT `id`, `share_type` FROM `*PREFIX*share`'
-			.' WHERE (`share_type` = ? AND `share_with` = ?) OR (`share_type` = ? AND `share_with` = ?)';
-		$result = \OC_DB::executeAudited($sql, array(self::SHARE_TYPE_GROUP, $arguments['gid'],
-			self::$shareTypeGroupUserUnique, $arguments['uid']));
-		while ($item = $result->fetchRow()) {
-			if ($item['share_type'] == self::SHARE_TYPE_GROUP) {
-				// Delete all reshares by this user of the group share
-				self::delete($item['id'], true, $arguments['uid']);
-			} else {
-				self::delete($item['id']);
-			}
-		}
-	}
-
-	/**
-	 * Function that is called after a group is removed. Cleans up the shares to that group.
-	 * @param array arguments
-	 */
-	public static function post_deleteGroup($arguments) {
-		$sql = 'SELECT `id` FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?';
-		$result = \OC_DB::executeAudited($sql, array(self::SHARE_TYPE_GROUP, $arguments['gid']));
-		while ($item = $result->fetchRow()) {
-			self::delete($item['id']);
-		}
+		return \OC\Share\Share::removeAllLinkShares();
 	}
 
 	/**
@@ -1928,26 +313,7 @@ class Share {
 	 * @return bool
 	 */
 	public static function checkPasswordProtectedShare(array $linkItem) {
-		if (!isset($linkItem['share_with'])) {
-			return true;
-		}
-		if (!isset($linkItem['share_type'])) {
-			return true;
-		}
-		if (!isset($linkItem['id'])) {
-			return true;
-		}
-
-		if ($linkItem['share_type'] != \OCP\Share::SHARE_TYPE_LINK) {
-			return true;
-		}
-
-		if ( \OC::$session->exists('public_link_authenticated')
-			&& \OC::$session->get('public_link_authenticated') === $linkItem['id'] ) {
-			return true;
-		}
-
-		return false;
+		return \OC\Share\Share::checkPasswordProtectedShare($linkItem);
 	}
 }
 
@@ -1960,9 +326,7 @@ interface Share_Backend {
 	 * Get the source of the item to be stored in the database
 	 * @param string Item source
 	 * @param string Owner of the item
-	 * @param string $itemSource
-	 * @param string $uidOwner
-	 * @return boolean Source
+	 * @return mixed|array|false Source
 	 *
 	 * Return an array if the item is file dependent, the array needs two keys: 'item' and 'file'
 	 * Return false if the item does not exist for the user
@@ -1985,8 +349,8 @@ interface Share_Backend {
 
 	/**
 	 * Converts the shared item sources back into the item in the specified format
-	 * @param array $items Shared items
-	 * @param integer $format
+	 * @param array Shared items
+	 * @param int Format
 	 * @return TODO
 	 *
 	 * The items array is a 3-dimensional array with the item_source as the
@@ -2018,9 +382,6 @@ interface Share_Backend_File_Dependent extends Share_Backend {
 	 * Get the file path of the item
 	 * @param string Item source
 	 * @param string User that is the owner of shared item
-	 * @param string $itemSource
-	 * @param string $uidOwner
-	 * @return boolean
 	 */
 	public function getFilePath($itemSource, $uidOwner);
 
diff --git a/lib/public/util.php b/lib/public/util.php
index 585c5d2263..f02213f244 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -89,14 +89,11 @@ class Util {
 	 */
 	public static function logException( $app, \Exception $ex ) {
 		$class = get_class($ex);
-		if ($class !== 'Exception') {
-			$message = $class . ': ';
-		}
-		$message .= $ex->getMessage();
+		$message = $class . ': ' . $ex->getMessage();
 		if ($ex->getCode()) {
 			$message .= ' [' . $ex->getCode() . ']';
 		}
-		\OCP\Util::writeLog($app, 'Exception: ' . $message, \OCP\Util::FATAL);
+		\OCP\Util::writeLog($app, $message, \OCP\Util::FATAL);
 		if (defined('DEBUG') and DEBUG) {
 			// also log stack trace
 			$stack = explode("\n", $ex->getTraceAsString());
@@ -269,7 +266,7 @@ class Util {
 		$host_name = \OC_Config::getValue('mail_domain', $host_name);
 		$defaultEmailAddress = $user_part.'@'.$host_name;
 
-		if (\OC_Mail::ValidateAddress($defaultEmailAddress)) {
+		if (\OC_Mail::validateAddress($defaultEmailAddress)) {
 			return $defaultEmailAddress;
 		}
 
@@ -495,4 +492,13 @@ class Util {
 	public static function isValidFileName($file) {
 		return \OC_Util::isValidFileName($file);
 	}
+
+	/**
+	 * @brief Generates a cryptographic secure pseudo-random string
+	 * @param Int $length of the random string
+	 * @return String
+	 */
+	public static function generateRandomBytes($length = 30) {
+		return \OC_Util::generateRandomBytes($length);
+	}
 }
diff --git a/ocs/v1.php b/ocs/v1.php
index 1c7d1c8976..62a3511e61 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -21,15 +21,21 @@
 *
 */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
+
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Exception\MethodNotAllowedException;
 
 try {
-	OC::getRouter()->match('/ocs'.OC_Request::getRawPathInfo());
+	// load all apps to get all api routes properly setup
+	OC_App::loadApps();
+
+	OC::$server->getRouter()->match('/ocs'.OC_Request::getRawPathInfo());
 } catch (ResourceNotFoundException $e) {
+	OC_API::setContentType();
 	OC_OCS::notFound();
 } catch (MethodNotAllowedException $e) {
+	OC_API::setContentType();
 	OC_Response::setStatus(405);
 }
 
diff --git a/public.php b/public.php
index 767295b98d..e072db93d2 100644
--- a/public.php
+++ b/public.php
@@ -1,5 +1,4 @@
 <?php
-$RUNTIME_NOAPPS = true;
 
 try {
 
diff --git a/remote.php b/remote.php
index 9e18c8f80a..15dfa8256f 100644
--- a/remote.php
+++ b/remote.php
@@ -1,5 +1,4 @@
 <?php
-$RUNTIME_NOAPPS = true;
 
 try {
 
diff --git a/search/ajax/search.php b/search/ajax/search.php
index f0ca5752b9..0cc1f9d30c 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -23,7 +23,6 @@
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
-OC_App::loadApps();
 
 $query=(isset($_GET['query']))?$_GET['query']:'';
 if($query) {
diff --git a/settings/admin.php b/settings/admin.php
index 42477bfc1c..ea8aa7af5d 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkAdminUser();
-OC_App::loadApps();
 
 OC_Util::addStyle( "settings", "settings" );
 OC_Util::addScript( "settings", "admin" );
@@ -20,6 +19,11 @@ $htaccessworking=OC_Util::isHtAccessWorking();
 $entries=OC_Log_Owncloud::getEntries(3);
 $entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3;
 
+// Should we display sendmail as an option?
+if (findBinaryPath('sendmailsendmail')) {
+	$tmpl->assign('sendmail_is_available', true);
+}
+
 $tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('mail_domain', OC_Config::getValue( "mail_domain", '' ));
 $tmpl->assign('mail_from_address', OC_Config::getValue( "mail_from_address", '' ));
@@ -40,6 +44,8 @@ $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking());
 $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
 $tmpl->assign('old_php', OC_Util::isPHPoutdated());
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
+$tmpl->assign('cron_log', OC_Config::getValue('cron_log', true));
+$tmpl->assign('lastcron', OC_Appconfig::getValue('core', 'lastcron', false));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 
 // Check if connected using HTTPS
@@ -61,3 +67,17 @@ foreach($forms as $form) {
 	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();
+
+/**
+ * Try to find a programm
+ *
+ * @param string $program
+ * @return null|string
+ */
+function findBinaryPath($program) {
+	exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
+	if ($returnCode === 0 && count($output) > 0) {
+		return escapeshellcmd($output[0]);
+	}
+	return null;
+}
diff --git a/settings/admin/controller.php b/settings/admin/controller.php
index 1a73c8fad3..d0dcc49f29 100644
--- a/settings/admin/controller.php
+++ b/settings/admin/controller.php
@@ -73,6 +73,36 @@ class Controller {
 		\OC_JSON::success(array("data" => array( "message" => $l->t("Saved") )));
 	}
 
+	/**
+	 * Send a mail to test the settings
+	 */
+	public static function sendTestMail() {
+		\OC_Util::checkAdminUser();
+		\OCP\JSON::callCheck();
+
+		$l = \OC_L10N::get('settings');
+		$email = \OC_Preferences::getValue(\OC_User::getUser(), 'settings', 'email', '');
+		if (!empty($email)) {
+			$defaults = new \OC_Defaults();
+
+			try {
+				\OC_Mail::send($email, $_POST['user'],
+					$l->t('test email settings'),
+					$l->t('If you received this email, the settings seem to be correct.'),
+					\OCP\Util::getDefaultEmailAddress('no-reply'), $defaults->getName());
+			} catch (\Exception $e) {
+				$message = $l->t('A problem occurred while sending the e-mail. Please revisit your settings.');
+				\OC_JSON::error( array( "data" => array( "message" => $message)) );
+				exit;
+			}
+
+			\OC_JSON::success(array("data" => array( "message" => $l->t("Email sent") )));
+		} else {
+			$message = $l->t('You need to set your user email before being able to send test emails.');
+			\OC_JSON::error( array( "data" => array( "message" => $message)) );
+		}
+	}
+
 	/**
 	 * Get the field name to use it in error messages
 	 *
@@ -87,7 +117,7 @@ class Controller {
 			case 'mail_smtpsecure':
 				return $l->t( 'Encryption' );
 			case 'mail_smtpauthtype':
-				return $l->t( 'Authentification method' );
+				return $l->t( 'Authentication method' );
 		}
 	}
 }
diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index b5f47bbcea..88c2bee614 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -6,7 +6,7 @@ OCP\JSON::callCheck();
 $l=OC_L10N::get('core');
 
 // Get data
-if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ) {
+if( isset( $_POST['email'] ) && OC_Mail::validateAddress($_POST['email']) ) {
 	$email=trim($_POST['email']);
 	OC_Preferences::setValue(OC_User::getUser(), 'settings', 'email', $email);
 	OC_JSON::success(array("data" => array( "message" => $l->t("Email saved") )));
diff --git a/settings/apps.php b/settings/apps.php
index 96b6d21b50..6fd2efc201 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -22,7 +22,6 @@
 */
 
 OC_Util::checkAdminUser();
-OC_App::loadApps();
 
 // Load the files we need
 OC_Util::addStyle( "settings", "settings" );
diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index e8c2a1943f..9f1e732996 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -8,9 +8,6 @@ class Controller {
 		\OC_JSON::callCheck();
 		\OC_JSON::checkLoggedIn();
 
-		// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
-		\OC_App::loadApps();
-
 		$username = \OC_User::getUser();
 		$password = isset($_POST['personal-password']) ? $_POST['personal-password'] : null;
 		$oldPassword = isset($_POST['oldpassword']) ? $_POST['oldpassword'] : '';
@@ -32,9 +29,6 @@ class Controller {
 		\OC_JSON::callCheck();
 		\OC_JSON::checkLoggedIn();
 
-		// Manually load apps to ensure hooks work correctly (workaround for issue 1503)
-		\OC_App::loadApps();
-
 		if (isset($_POST['username'])) {
 			$username = $_POST['username'];
 		} else {
diff --git a/settings/css/settings.css b/settings/css/settings.css
index a47e7bf656..2cb1867087 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -152,7 +152,6 @@ table.grid td.date{
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
 span.connectionwarning {color:#933; font-weight:bold; }
-input[type=radio] { width:1em; }
 table.shareAPI td { padding-bottom: 0.8em; }
 
 #mail_settings p label:first-child {
@@ -167,6 +166,26 @@ table.shareAPI td { padding-bottom: 0.8em; }
 	width: 40px;
 }
 
+.cronlog {
+	margin-left: 10px;
+}
+
+.cronstatus {
+	display: inline-block;
+	height: 16px;
+	width: 16px;
+	vertical-align: text-bottom;
+}
+
+span.success {
+        background: #37ce02;
+        border-radius: 8px;
+}
+
+span.error {
+        background: #ce3702;
+}
+
 /* HELP */
 .pressed {background-color:#DDD;}
 
diff --git a/settings/help.php b/settings/help.php
index 88693939b8..301f50592a 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkLoggedIn();
-OC_App::loadApps();
 
 // Load the files we need
 OC_Util::addStyle( "settings", "settings" );
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 5ea6a5af2d..c04c0505de 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -62,10 +62,18 @@ $(document).ready(function(){
 	});
 
 	$('#mail_settings').change(function(){
-		OC.msg.startSaving('#mail_settings .msg');
+		OC.msg.startSaving('#mail_settings_msg');
 		var post = $( "#mail_settings" ).serialize();
-		$.post(OC.Router.generate('settings_mail_settings'), post, function(data){
+		$.post(OC.generateUrl('/settings/admin/mailsettings'), post, function(data){
 			OC.msg.finishedSaving('#mail_settings .msg', data);
 		});
 	});
+
+	$('#sendtestemail').click(function(){
+		OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending...'));
+		var post = $( "#sendtestemail" ).serialize();
+		$.post(OC.generateUrl('/settings/admin/mailtest'), post, function(data){
+			OC.msg.finishedAction('#sendtestmail_msg', data);
+		});
+	});
 });
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 98bfe7132d..f502037cfd 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -60,6 +60,8 @@ function updateAvatar (hidedefault) {
 	}
 	$displaydiv.css({'background-color': ''});
 	$displaydiv.avatar(OC.currentUser, 128, true);
+
+	$('#removeavatar').show();
 }
 
 function showAvatarCropper() {
@@ -67,7 +69,7 @@ function showAvatarCropper() {
 	$cropper.prepend("<img>");
 	$cropperImage = $('#cropper img');
 
-	$cropperImage.attr('src', OC.Router.generate('core_avatar_get_tmp')+'?requesttoken='+oc_requesttoken+'#'+Math.floor(Math.random()*1000));
+	$cropperImage.attr('src', OC.generateUrl('/avatar/tmp')+'?requesttoken='+oc_requesttoken+'#'+Math.floor(Math.random()*1000));
 
 	// Looks weird, but on('load', ...) doesn't work in IE8
 	$cropperImage.ready(function(){
@@ -95,7 +97,7 @@ function sendCropData() {
 		w: cropperdata.w,
 		h: cropperdata.h
 	};
-	$.post(OC.Router.generate('core_avatar_post_cropped'), {crop: data}, avatarResponseHandler);
+	$.post(OC.generateUrl('/avatar/cropped'), {crop: data}, avatarResponseHandler);
 }
 
 function saveCoords(c) {
@@ -132,7 +134,7 @@ $(document).ready(function(){
 			$('#passwordchanged').hide();
 			$('#passworderror').hide();
 			// Ajax foo
-			$.post(OC.Router.generate('settings_personal_changepassword'), post, function(data){
+			$.post(OC.generateUrl('/settings/personal/changepassword'), post, function(data){
 				if( data.status === "success" ){
 					$('#pass1').val('');
 					$('#pass2').val('');
@@ -243,7 +245,7 @@ $(document).ready(function(){
 		OC.dialogs.filepicker(
 			t('settings', "Select a profile picture"),
 			function(path){
-				$.post(OC.Router.generate('core_avatar_post'), {path: path}, avatarResponseHandler);
+				$.post(OC.generateUrl('/avatar/'), {path: path}, avatarResponseHandler);
 			},
 			false,
 			["image/png", "image/jpeg"]
@@ -253,9 +255,10 @@ $(document).ready(function(){
 	$('#removeavatar').click(function(){
 		$.ajax({
 			type:	'DELETE',
-			url:	OC.Router.generate('core_avatar_delete'),
+			url:	OC.generateUrl('/avatar/'),
 			success: function(msg) {
 				updateAvatar(true);
+				$('#removeavatar').hide();
 			}
 		});
 	});
@@ -278,6 +281,18 @@ $(document).ready(function(){
 			t('core', 'Strong password')
 		]
 	});
+
+	// does the user have a custom avatar? if he does hide #removeavatar
+	// needs to be this complicated because we can't check yet if an avatar has been loaded, because it's async
+	var url = OC.generateUrl(
+		'/avatar/{user}/{size}',
+		{user: OC.currentUser, size: 1}
+	) + '?requesttoken=' + oc_requesttoken;
+	$.get(url, function(result) {
+		if (typeof(result) === 'object') {
+			$('#removeavatar').hide();
+		}
+	});
 } );
 
 OC.Encryption = {
diff --git a/settings/js/users.js b/settings/js/users.js
index 160d0a8d9d..284976d3ba 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -225,7 +225,8 @@ var UserList = {
 		}
 		$('table+.loading').css('visibility', 'visible');
 		UserList.updating = true;
-		$.get(OC.Router.generate('settings_ajax_userlist', { offset: UserList.offset, limit: UserList.usersToLoad }), function (result) {
+		var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad });
+		$.get(OC.generateUrl('/settings/ajax/userlist') + query, function (result) {
 			var loadedUsers = 0;
 			var trs = [];
 			if (result.status === 'success') {
@@ -371,9 +372,7 @@ $(document).ready(function () {
 
 	UserList.doSort();
 	UserList.availableGroups = $('#content table').data('groups');
-	OC.Router.registerLoadedCallback(function() {
-		$(window).scroll(function(e) {UserList._onScroll(e);});
-	});
+	$(window).scroll(function(e) {UserList._onScroll(e);});
 	$('table').after($('<div class="loading" style="height: 200px; visibility: hidden;"></div>'));
 
 	$('select[multiple]').each(function (index, element) {
@@ -401,7 +400,7 @@ $(document).ready(function () {
 				if ($(this).val().length > 0) {
 					var recoveryPasswordVal = $('input:password[id="recoveryPassword"]').val();
 					$.post(
-						OC.Router.generate('settings_users_changepassword'),
+						OC.generateUrl('/settings/users/changepassword'),
 						{username: uid, password: $(this).val(), recoveryPassword: recoveryPasswordVal},
 						function (result) {
 							if (result.status != 'success') {
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 67cbc6655d..cdc689a211 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,7 +1,18 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "ادخال خاطئ لقيمة %s",
+"Saved" => "حفظ",
+"test email settings" => "إعدادات البريد التجريبي",
+"If you received this email, the settings seem to be correct." => "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "حدث خطأ اثناء ارسال البريد الالكتروني ، الرجاء مراجعة اعداداتك",
+"Email sent" => "تم ارسال البريد الالكتروني",
+"Send mode" => "وضعية الإرسال",
+"Encryption" => "التشفير",
+"Authentication method" => "أسلوب التطابق",
 "Unable to load list from App Store" => "فشل تحميل القائمة من الآب ستور",
 "Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
+"Your full name has been changed." => "اسمك الكامل تم تغييره.",
+"Unable to change full name" => "لم يتم التمكن من تغيير اسمك الكامل",
 "Group already exists" => "المجموعة موجودة مسبقاً",
 "Unable to add group" => "فشل إضافة المجموعة",
 "Email saved" => "تم حفظ البريد الإلكتروني",
@@ -14,16 +25,31 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "فشل إضافة المستخدم الى المجموعة %s",
 "Unable to remove user from group %s" => "فشل إزالة المستخدم من المجموعة %s",
 "Couldn't update app." => "تعذر تحديث التطبيق.",
+"Wrong password" => "كلمة مرور خاطئة",
+"No user supplied" => "لم يتم توفير مستخدم ",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "يرجى توفير كلمة مرور المسؤول المستردة, وإلا سيتم فقد جميع بيانات المستخدم ",
+"Wrong admin recovery password. Please check the password and try again." => "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
+"Unable to change password" => "لا يمكن تغيير كلمة المرور",
+"Sending..." => "جاري الارسال ...",
+"User Documentation" => "كتاب توثيق المستخدم",
 "Update to {appversion}" => "تم التحديث الى ",
 "Disable" => "إيقاف",
 "Enable" => "تفعيل",
 "Please wait...." => "الرجاء الانتظار ...",
+"Error while disabling app" => "خطا عند تعطيل البرنامج",
+"Error while enabling app" => "خطا عند تفعيل البرنامج ",
 "Updating...." => "جاري التحديث ...",
 "Error while updating app" => "حصل خطأ أثناء تحديث التطبيق",
 "Error" => "خطأ",
 "Update" => "حدث",
 "Updated" => "تم التحديث بنجاح",
-"Saving..." => "جاري الحفظ...",
+"Select a profile picture" => "اختر صورة الملف الشخصي ",
+"Very weak password" => "كلمة السر ضعيفة جدا",
+"Weak password" => "كلمة السر ضعيفة",
+"Good password" => "كلمة السر جيدة",
+"Strong password" => "كلمة السر قوية",
+"Decrypting files... Please wait, this can take some time." => "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
 "deleted" => "تم الحذف",
 "undo" => "تراجع",
 "Unable to remove user" => "تعذر حذف المستخدم",
@@ -34,27 +60,55 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح",
 "Error creating user" => "حصل خطأ اثناء انشاء مستخدم",
 "A valid password must be provided" => "يجب ادخال كلمة مرور صحيحة",
+"Warning: Home directory for user \"{user}\" already exists" => "تحذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا",
 "__language_name__" => "__language_name__",
+"Everything (fatal issues, errors, warnings, info, debug)" => "كل شيء (مشاكل فادحة, اخطاء , تحذيرات , معلومات , تصحيح الاخطاء)",
+"Info, warnings, errors and fatal issues" => "معلومات , تحذيرات , اخطاء , مشاكل فادحة ",
+"Warnings, errors and fatal issues" => "تحذيرات , اخطاء , مشاكل فادحة ",
+"Errors and fatal issues" => "اخطاء ومشاكل فادحة ",
+"Fatal issues only" => "مشاكل فادحة فقط ",
+"None" => "لا شيء",
+"Login" => "تسجيل الدخول",
 "Security Warning" => "تحذير أمان",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "انت تستخدم %s عن طريق HTTP . نحن نقترح باصرار ان تهيء الخادم ليتمكن من الوصول عن طريق 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." => "مجلد data و ملفاتك يمكن الوصول لها عن طريق الانترنت. ملف .htaccess لا يمكن تشغيلة. نحن نقترح باصرار ان تعيد اعداد خادمك لمنع الدخول الى بياناتك عن طريق الانترنت او بالامكان ان تنقل مجلد data خارج document root بشكل مؤقت. ",
 "Setup Warning" => "تحذير في التنصيب",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "اعدادات خادمك غير صحيحة بشكل تسمح لك بمزامنة ملفاتك وذلك بسبب أن واجهة WebDAV تبدو معطلة",
+"Please double check the <a href=\"%s\">installation guides</a>." => "يرجى التحقق <a href=\"%s\">دليل التثبيت</a>.",
 "Module 'fileinfo' missing" => "الموديل 'fileinfo' مفقود",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "موديل  'fileinfo' الخاص بالـPHP  مفقود . نوصي بتفعيل هذا الموديل للحصول على أفضل النتائج مع خاصية التحقق ",
+"Your PHP version is outdated" => "اصدار PHP الخاص بك قديم",
+"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." => "اصدار PHP الخاص بك قديم. نحن نقترح لك باصرار ان يتم ترقية الاصدار الى  5.3.8 او احدث بسبب ان الاصدارات القديمة معروفة انها مهمشة. من الممكن ان التنزيل قد لا يتم بصورة صحيحة.",
 "Locale not working" => "اللغه لا تعمل",
+"System locale can not be set to a one which supports UTF-8." => "لا يمكن تعيين لغة النظام الى احد اللغات التي تدعم UTF-8.",
+"This means that there might be problems with certain characters in file names." => "هذا يعني انه من الممكن ان يكون هناك مشكلة في بعض الاحرف في اسم الملف.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s.",
 "Internet connection not working" => "الاتصال بالانترنت لا يعمل",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التحديثات او تنزيلات برامج الطرف الثالث3  لا تعمل. الدخول للملفات البعيدة و ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. نحن نقترح بتفعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستفادة من كل الميزات",
 "Cron" => "مجدول",
 "Execute one task with each page loaded" => "قم بتنفيذ مهمة واحدة مع كل صفحة تم تحميلها",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "الملف cron.php تم تسجيله فى خدمه webcron  لاستدعاء الملف cron.php كل  15 دقيقه",
+"Use systems cron service to call the cron.php file every 15 minutes." => "استخدم نظام خدمة cron لـ استدعاء ملف cron.php كل 15 دقيقة ",
 "Sharing" => "مشاركة",
 "Enable Share API" => "السماح بالمشاركة عن طريق الAPI ",
 "Allow apps to use the Share API" => "السماح للتطبيقات بالمشاركة عن طريق الAPI",
 "Allow links" => "السماح بالعناوين",
 "Allow users to share items to the public with links" => "السماح للمستعملين بمشاركة البنود للعموم عن طريق الروابط ",
+"Allow public uploads" => "السماح بالرفع للعامة ",
+"Allow users to enable others to upload into their publicly shared folders" => "السماح للمستخدمين بتفعيل الرفع للاخرين من خلال مجلد المشاركة العام ",
 "Allow resharing" => "السماح بإعادة المشاركة ",
 "Allow users to share items shared with them again" => "السماح للمستخدمين باعادة مشاركة الملفات التي تم مشاركتها معهم",
 "Allow users to share with anyone" => "السماح للمستعملين بإعادة المشاركة مع أي أحد  ",
 "Allow users to only share with users in their groups" => "السماح للمستعمينٍ لإعادة المشاركة فقط مع المستعملين في مجموعاتهم",
+"Allow mail notification" => "السماح بتنبيهات البريد الالكتروني.",
+"Allow user to send mail notification for shared files" => "السماح للمستخدم الى ارسال تنبيه البريد الالكتروني للملفات المشتركة ",
 "Security" => "حماية",
 "Enforce HTTPS" => "فرض HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
+"Email Server" => "خادم البريد الالكتروني",
+"Server address" => "عنوان الخادم",
+"Port" => "المنفذ",
 "Log" => "سجل",
 "Log level" => "مستوى السجل",
 "More" => "المزيد",
@@ -64,9 +118,9 @@ $TRANSLATIONS = array(
 "Add your App" => "أضف تطبيقاتك",
 "More Apps" => "المزيد من التطبيقات",
 "Select an App" => "إختر تطبيقاً",
+"Documentation:" => "التوثيق",
 "See application page at apps.owncloud.com" => "راجع صفحة التطبيق على apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ترخيص من قبل <span class=\"author\"></span>",
-"User Documentation" => "كتاب توثيق المستخدم",
 "Administrator Documentation" => "كتاب توثيق المدير",
 "Online Documentation" => "توثيق متوفر على الشبكة",
 "Forum" => "منتدى",
@@ -81,21 +135,35 @@ $TRANSLATIONS = array(
 "Current password" => "كلمات السر الحالية",
 "New password" => "كلمات سر جديدة",
 "Change password" => "عدل كلمة السر",
+"Full Name" => "اسمك الكامل",
 "Email" => "البريد الإلكترونى",
 "Your email address" => "عنوانك البريدي",
-"Fill in an email address to enable password recovery" => "أدخل عنوانك البريدي لتفعيل استرجاع كلمة المرور",
-"Abort" => "إلغاء.",
+"Profile picture" => "صورة الملف الشخصي",
+"Upload new" => "رفع الان",
+"Select new from Files" => "اختر جديد من الملفات ",
+"Remove image" => "احذف الصورة ",
+"Either png or jpg. Ideally square but you will be able to crop it." => "سواء png او jpg. بامكانك قص الصورة ",
+"Your avatar is provided by your original account." => "صورتك الرمزية يتم توفيرها عن طريق حسابك الاصلي.",
+"Cancel" => "الغاء",
+"Choose as profile image" => "اختر صورة الملف الشخصي",
 "Language" => "اللغة",
 "Help translate" => "ساعد في الترجمه",
 "WebDAV" => "WebDAV",
-"Encryption" => "التشفير",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "استخدم هذا العنوان لـ  <a href=\"%s\" target=\"_blank\">الدخول الى ملفاتك عن طريق WebDAV</a>",
+"The encryption app is no longer enabled, please decrypt all your files" => "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
+"Log-in password" => "كلمه سر الدخول",
+"Decrypt all Files" => "فك تشفير جميع الملفات ",
 "Login Name" => "اسم الدخول",
 "Create" => "انشئ",
+"Admin Recovery Password" => "استعادة كلمة المرور للمسؤول",
+"Enter the recovery password in order to recover the users files during password change" => "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
 "Default Storage" => "وحدة التخزين الافتراضية",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
 "Unlimited" => "غير محدود",
 "Other" => "شيء آخر",
 "Username" => "إسم المستخدم",
 "Storage" => "وحدة التخزين",
+"change full name" => "تغيير اسمك الكامل",
 "set new password" => "اعداد كلمة مرور جديدة",
 "Default" => "افتراضي"
 );
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 17163027d4..4715447b7f 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Пощата е изпратена",
+"Encryption" => "Криптиране",
 "Authentication error" => "Възникна проблем с идентификацията",
 "Group already exists" => "Групата вече съществува",
 "Unable to add group" => "Невъзможно добавяне на група",
@@ -9,6 +11,7 @@ $TRANSLATIONS = array(
 "Unable to delete user" => "Невъзможно изтриване на потребител",
 "Language changed" => "Езикът е променен",
 "Invalid request" => "Невалидна заявка",
+"User Documentation" => "Потребителска документация",
 "Update to {appversion}" => "Обновяване до {appversion}",
 "Disable" => "Изключено",
 "Enable" => "Включено",
@@ -17,23 +20,24 @@ $TRANSLATIONS = array(
 "Error" => "Грешка",
 "Update" => "Обновяване",
 "Updated" => "Обновено",
-"Saving..." => "Записване...",
 "deleted" => "изтрито",
 "undo" => "възтановяване",
 "Groups" => "Групи",
 "Delete" => "Изтриване",
 "add group" => "нова група",
 "__language_name__" => "__language_name__",
+"None" => "Няма",
+"Login" => "Вход",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Вашият web сървър все още не е удачно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
 "Cron" => "Крон",
 "Sharing" => "Споделяне",
+"Server address" => "Адрес на сървъра",
 "More" => "Още",
 "Less" => "По-малко",
 "Version" => "Версия",
 "Add your App" => "Добавете Ваше приложение",
 "More Apps" => "Още приложения",
 "Select an App" => "Изберете приложение",
-"User Documentation" => "Потребителска документация",
 "Administrator Documentation" => "Административна документация",
 "Online Documentation" => "Документация",
 "Forum" => "Форум",
@@ -47,11 +51,10 @@ $TRANSLATIONS = array(
 "Change password" => "Промяна на паролата",
 "Email" => "E-mail",
 "Your email address" => "Вашия email адрес",
-"Fill in an email address to enable password recovery" => "Въведете е-поща за възстановяване на паролата",
+"Cancel" => "Отказ",
 "Language" => "Език",
 "Help translate" => "Помогнете с превода",
 "WebDAV" => "WebDAV",
-"Encryption" => "Криптиране",
 "Login Name" => "Потребител",
 "Create" => "Създаване",
 "Default Storage" => "Хранилище по подразбиране",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 55528b71cf..574426ea63 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "ই-মেইল পাঠানো হয়েছে",
+"Encryption" => "সংকেতায়ন",
 "Unable to load list from App Store" => "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়",
 "Authentication error" => "অনুমোদন ঘটিত সমস্যা",
 "Group already exists" => "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
@@ -13,17 +15,21 @@ $TRANSLATIONS = array(
 "Admins can't remove themself from the admin group" => "প্রশাসকবৃন্দ তাদেরকে প্রশাসক গোষ্ঠী থেকে মুছে ফেলতে পারবেন না",
 "Unable to add user to group %s" => " %s গোষ্ঠীতে ব্যবহারকারী যোগ করা সম্ভব হলো না ",
 "Unable to remove user from group %s" => "%s গোষ্ঠী থেকে ব্যবহারকারীকে অপসারণ করা সম্ভব হলো না",
+"User Documentation" => "ব্যবহারকারী সহায়িকা",
 "Disable" => "নিষ্ক্রিয়",
 "Enable" => "সক্রিয় ",
 "Error" => "সমস্যা",
 "Update" => "পরিবর্ধন",
-"Saving..." => "সংরক্ষণ করা হচ্ছে..",
 "undo" => "ক্রিয়া প্রত্যাহার",
 "Groups" => "গোষ্ঠীসমূহ",
 "Group Admin" => "গোষ্ঠী প্রশাসক",
 "Delete" => "মুছে",
 "__language_name__" => "__language_name__",
+"None" => "কোনটিই নয়",
+"Login" => "প্রবেশ",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
+"Server address" => "সার্ভার ঠিকানা",
+"Port" => "পোর্ট",
 "More" => "বেশী",
 "Less" => "কম",
 "Version" => "ভার্সন",
@@ -33,7 +39,6 @@ $TRANSLATIONS = array(
 "Select an App" => "অ্যাপ নির্বাচন করুন",
 "See application page at apps.owncloud.com" => "apps.owncloud.com এ অ্যাপ্লিকেসন পৃষ্ঠা দেখুন",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-লাইসেন্সধারী <span class=\"author\"></span>",
-"User Documentation" => "ব্যবহারকারী সহায়িকা",
 "Administrator Documentation" => "প্রশাসক সহায়িকা",
 "Online Documentation" => "অনলাইন সহায়িকা",
 "Forum" => "ফোরাম",
@@ -49,11 +54,11 @@ $TRANSLATIONS = array(
 "Change password" => "কূটশব্দ পরিবর্তন করুন",
 "Email" => "ইমেইল",
 "Your email address" => "আপনার ই-মেইল ঠিকানা",
-"Fill in an email address to enable password recovery" => "কূটশব্দ পূনরূদ্ধার সক্রিয় করার জন্য ই-মেইল ঠিকানাটি পূরণ করুন",
+"Cancel" => "বাতির",
 "Language" => "ভাষা",
 "Help translate" => "অনুবাদ করতে সহায়তা করুন",
 "WebDAV" => "WebDAV",
-"Encryption" => "সংকেতায়ন",
+"Login Name" => "প্রবেশ",
 "Create" => "তৈরী কর",
 "Default Storage" => "পূর্বনির্ধারিত সংরক্ষণাগার",
 "Unlimited" => "অসীম",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 316eadc19a..54fe0bbcf3 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,5 +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.",
@@ -22,6 +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",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Actualitza",
 "Updated" => "Actualitzada",
 "Select a profile picture" => "Seleccioneu una imatge de perfil",
+"Very weak password" => "Contrasenya massa feble",
+"Weak password" => "Contrasenya feble",
+"So-so password" => "Contrasenya passable",
+"Good password" => "Contrasenya bona",
+"Strong password" => "Contrasenya forta",
 "Decrypting files... Please wait, this can take some time." => "Desencriptant fitxers... Espereu, això pot trigar una estona.",
-"Saving..." => "Desant...",
 "deleted" => "esborrat",
 "undo" => "desfés",
 "Unable to remove user" => "No s'ha pogut eliminar l'usuari",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avisos, errors i problemes fatals",
 "Errors and fatal issues" => "Errors i problemes fatals",
 "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.",
@@ -61,6 +84,8 @@ $TRANSLATIONS = array(
 "Please double check the <a href=\"%s\">installation guides</a>." => "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
 "Module 'fileinfo' missing" => "No s'ha trobat el mòdul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
+"Your PHP version is outdated" => "La versió de PHP és obsoleta",
+"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." => "La versió de PHP és obsoleta. Us recomanem fermament que actualitzeu a la versió 5.3.8 o superior perquè les versions anteriors no funcionen. La instal·lació podria no funcionar correctament.",
 "Locale not working" => "Locale no funciona",
 "System locale can not be set to a one which supports UTF-8." => "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.",
 "This means that there might be problems with certain characters in file names." => "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
@@ -68,6 +93,7 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "La connexió a internet no funciona",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Aquest servidor no té cap connexió a internet que funcioni. Això significa que algunes de les característiques com el muntatge d'emmagatzemament extern, les notificacions quant a actualitzacions o la instal·lació d'aplicacions de tercers no funcionarà. L'accés remot a fitxers i l'enviament de correus electrònics podria tampoc no funcionar. Us suggerim que habiliteu la connexió a internet per aquest servidor si voleu tenir totes les característiques.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "L'últim cron s'ha executat el %s",
 "Execute one task with each page loaded" => "Executa una tasca per cada paquet carregat",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Utilitza el servei cron del sistema per fer una crida al fitxer cron.php cada 15 minuts.",
@@ -88,6 +114,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",
@@ -97,9 +134,10 @@ $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>",
-"User Documentation" => "Documentació d'usuari",
 "Administrator Documentation" => "Documentació d'administrador",
 "Online Documentation" => "Documentació en línia",
 "Forum" => "Fòrum",
@@ -117,20 +155,19 @@ $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" => "Ompliu el correu electrònic per activar la recuperació de contrasenya",
+"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",
 "Remove image" => "Elimina imatge",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la.",
 "Your avatar is provided by your original account." => "El vostre compte original proporciona l'avatar.",
-"Abort" => "Cancel·la",
+"Cancel" => "Cancel·la",
 "Choose as profile image" => "Selecciona com a imatge de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajudeu-nos amb la traducció",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Useu aquesta adreça per <a href=\"%s\" target=\"_blank\">accedir als fitxers via WebDAV</a>",
-"Encryption" => "Xifrat",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
 "Log-in password" => "Contrasenya d'accés",
 "Decrypt all Files" => "Desencripta tots els fitxers",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index c89b3b6a5d..960938b1c6 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Uvedena nesprávná hodnota pro %s",
+"Saved" => "Uloženo",
+"test email settings" => "otestovat nastavení e-mailu",
+"If you received this email, the settings seem to be correct." => "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Při odesílání e-mailu nastala chyba. Překontrolujte vaše nastavení.",
+"Email sent" => "E-mail odeslán",
+"You need to set your user email before being able to send test emails." => "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
+"Send mode" => "Mód odesílání",
+"Encryption" => "Šifrování",
+"Authentication method" => "Metoda ověření",
 "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.",
@@ -22,6 +32,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",
@@ -34,8 +47,12 @@ $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.",
-"Saving..." => "Ukládám...",
 "deleted" => "smazáno",
 "undo" => "vrátit zpět",
 "Unable to remove user" => "Nelze odebrat uživatele",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Varování, chyby a fatální problémy",
 "Errors and fatal issues" => "Chyby a fatální problémy",
 "Fatal issues only" => "Pouze fatální problémy",
+"None" => "Žádné",
+"Login" => "Přihlásit",
+"Plain" => "Čistý text",
+"NT LAN Manager" => "Správce NT LAN",
+"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.",
@@ -61,8 +84,8 @@ $TRANSLATIONS = array(
 "Please double check the <a href=\"%s\">installation guides</a>." => "Zkontrolujte prosím znovu <a href=\"%s\">instalační příručku</a>.",
 "Module 'fileinfo' missing" => "Schází modul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Schází PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.",
-"Your PHP version is outdated" => "Tato verze PHP je zastaralá.",
-"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." => "Tato verze PHP je zastaralá. Důrazně doporučujeme aktualizovat na verzi 5.3.8 nebo novější, protože starší verze jsou chybné. Je možné, že tato instalace nebude fungovat správně.",
+"Your PHP version is outdated" => "Vaše verze PHP je zastaralá",
+"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." => "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ě.",
 "Locale not working" => "Lokalizace nefunguje",
 "System locale can not be set to a one which supports UTF-8." => "Není možné nastavit znakovou sadu, která podporuje UTF-8.",
 "This means that there might be problems with certain characters in file names." => "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.",
@@ -70,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Připojení k internetu nefunguje",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Poslední cron byl spuštěn v %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Poslední cron byl spuštěn v  %s. To se stalo před více než hodinu. Vypadá to, že není něco v pořádku.",
+"Cron was not executed yet!" => "Cron ještě nebyl spuštěn!",
 "Execute one task with each page loaded" => "Spustit jednu úlohu s každým načtením stránky",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je registrován u služby webcron, aby volal cron.php jednou za 15 minut přes http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Použít systémovou službu cron pro volání cron.php každých 15 minut.",
@@ -90,6 +116,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" => "E-mailový server",
+"This is used for sending out notifications." => "Toto se používá pro odesílání upozornění.",
+"From address" => "Adresa odesílatele",
+"Authentication required" => "Vyžadováno ověření",
+"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" => "Otestovat nastavení e-mailu",
+"Send email" => "Odeslat e-mail",
 "Log" => "Záznam",
 "Log level" => "Úroveň zaznamenávání",
 "More" => "Více",
@@ -99,9 +136,10 @@ $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>",
-"User Documentation" => "Uživatelská dokumentace",
 "Administrator Documentation" => "Dokumentace správce",
 "Online Documentation" => "Online dokumentace",
 "Forum" => "Fórum",
@@ -119,20 +157,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Celé jméno",
 "Email" => "E-mail",
 "Your email address" => "Vaše e-mailová adresa",
-"Fill in an email address to enable password recovery" => "Pro povolení obnovy hesla vyplňte e-mailovou adresu",
+"Fill in an email address to enable password recovery and receive notifications" => "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění.",
 "Profile picture" => "Profilový obrázek",
 "Upload new" => "Nahrát nový",
 "Select new from Files" => "Vyberte nový ze souborů",
 "Remove image" => "Odebrat obrázek",
 "Either png or jpg. Ideally square but you will be able to crop it." => "png nebo jpg, nejlépe čtvercový, ale budete mít možnost jej oříznout.",
 "Your avatar is provided by your original account." => "Váš avatar je poskytován Vaším původním účtem.",
-"Abort" => "Přerušit",
+"Cancel" => "Zrušit",
 "Choose as profile image" => "Vybrat jako profilový obrázek",
 "Language" => "Jazyk",
 "Help translate" => "Pomoci s překladem",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použijte <a href=\"%s\" target=\"_blank\">tuto adresu pro přístup k vašim souborům přes WebDAV</a>",
-"Encryption" => "Šifrování",
 "The encryption app is no longer enabled, please decrypt all your files" => "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory",
 "Log-in password" => "Přihlašovací heslo",
 "Decrypt all Files" => "Odšifrovat všechny soubory",
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index da8d02a9e4..5beeeadae9 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -1,18 +1,22 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Anfonwyd yr e-bost",
+"Encryption" => "Amgryptiad",
 "Authentication error" => "Gwall dilysu",
 "Invalid request" => "Cais annilys",
 "Error" => "Gwall",
-"Saving..." => "Yn cadw...",
 "undo" => "dadwneud",
 "Groups" => "Grwpiau",
 "Delete" => "Dileu",
+"None" => "Dim",
+"Login" => "Mewngofnodi",
 "Security Warning" => "Rhybudd Diogelwch",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
 "Password" => "Cyfrinair",
 "New password" => "Cyfrinair newydd",
 "Email" => "E-bost",
-"Encryption" => "Amgryptiad",
+"Cancel" => "Diddymu",
+"Login Name" => "Mewngofnodi",
 "Other" => "Arall",
 "Username" => "Enw defnyddiwr"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 6fe3cf6c39..df8d2c419b 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,5 +1,9 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Gemt",
+"test email settings" => "test email indstillinger",
+"Email sent" => "E-mail afsendt",
+"Encryption" => "Kryptering",
 "Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
 "Authentication error" => "Adgangsfejl",
 "Your full name has been changed." => "Dit fulde navn er blevet ændret.",
@@ -22,6 +26,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
 "Unable to change password" => "Kunne ikke ændre kodeord",
+"Sending..." => "Sender...",
+"User Documentation" => "Brugerdokumentation",
+"Admin Documentation" => "Administrator Dokumentation",
 "Update to {appversion}" => "Opdatér til {appversion}",
 "Disable" => "Deaktiver",
 "Enable" => "Aktiver",
@@ -34,8 +41,12 @@ $TRANSLATIONS = array(
 "Update" => "Opdater",
 "Updated" => "Opdateret",
 "Select a profile picture" => "Vælg et profilbillede",
+"Very weak password" => "Meget svagt kodeord",
+"Weak password" => "Svagt kodeord",
+"So-so password" => "Jævnt kodeord",
+"Good password" => "Godt kodeord",
+"Strong password" => "Stærkt kodeord",
 "Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
-"Saving..." => "Gemmer...",
 "deleted" => "Slettet",
 "undo" => "fortryd",
 "Unable to remove user" => "Kan ikke fjerne bruger",
@@ -53,6 +64,11 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Advarsler, fejl og alvorlige fejl",
 "Errors and fatal issues" => "Fejl og alvorlige fejl",
 "Fatal issues only" => "Kun alvorlige fejl",
+"None" => "Ingen",
+"Login" => "Login",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Sikkerhedsadvarsel",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du tilgår %s via HTTP. Vi anbefaler at du konfigurerer din server til i stedet at kræve 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." => "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod.  ",
@@ -90,6 +106,16 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Gennemtving HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
+"Email Server" => "Email Server",
+"From address" => "Fra adresse",
+"Authentication required" => "Godkendelse påkrævet",
+"Server address" => "Serveradresse",
+"Port" => "Port",
+"Credentials" => "Brugeroplysninger",
+"SMTP Username" => "SMTP Brugernavn",
+"SMTP Password" => "SMTP Kodeord",
+"Test email settings" => "Test email indstillinger",
+"Send email" => "Send email",
 "Log" => "Log",
 "Log level" => "Log niveau",
 "More" => "Mere",
@@ -99,9 +125,9 @@ $TRANSLATIONS = array(
 "Add your App" => "Tilføj din App",
 "More Apps" => "Flere Apps",
 "Select an App" => "Vælg en App",
+"Documentation:" => "Dokumentation:",
 "See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>",
-"User Documentation" => "Brugerdokumentation",
 "Administrator Documentation" => "Administrator Dokumentation",
 "Online Documentation" => "Online dokumentation",
 "Forum" => "Forum",
@@ -119,20 +145,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Fulde navn",
 "Email" => "E-mail",
 "Your email address" => "Din emailadresse",
-"Fill in an email address to enable password recovery" => "Indtast en emailadresse for at kunne få påmindelse om adgangskode",
 "Profile picture" => "Profilbillede",
 "Upload new" => "Upload nyt",
 "Select new from Files" => "Vælg nyt fra Filer",
 "Remove image" => "Fjern billede",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. ",
 "Your avatar is provided by your original account." => "Din avatar kommer fra din oprindelige konto.",
-"Abort" => "Afbryd",
+"Cancel" => "Annuller",
 "Choose as profile image" => "Vælg som profilbillede",
 "Language" => "Sprog",
 "Help translate" => "Hjælp med oversættelsen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Brug denne adresse for at <a href=\"%s\" target=\"_blank\">tilgå dine filer via WebDAV</a>",
-"Encryption" => "Kryptering",
 "The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
 "Log-in password" => "Log-in kodeord",
 "Decrypt all Files" => "Dekrypter alle Filer ",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index b9432f187e..ffbda89301 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Ungültiger Wert für %s übermittelt",
+"Saved" => "Gespeichert",
+"test email settings" => "E-Mail-Einstellungen teste",
+"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen",
+"Email sent" => "E-Mail wurde verschickt",
+"You need to set your user email before being able to send test emails." => "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.",
+"Send mode" => "Sende-Modus",
+"Encryption" => "Verschlüsselung",
+"Authentication method" => "Authentifizierungsmethode",
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Your full name has been changed." => "Dein vollständiger Name ist geändert worden.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
 "Unable to change password" => "Passwort konnte nicht geändert werden",
+"Sending..." => "Sende...",
+"User Documentation" => "Dokumentation für Benutzer",
+"Admin Documentation" => "Admin-Dokumentation",
 "Update to {appversion}" => "Aktualisiere zu {appversion}",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Aktualisierung durchführen",
 "Updated" => "Aktualisiert",
 "Select a profile picture" => "Wähle ein Profilbild",
+"Very weak password" => "Sehr schwaches Passwort",
+"Weak password" => "Schwaches Passwort",
+"So-so password" => "Durchschnittliches Passwort",
+"Good password" => "Gutes Passwort",
+"Strong password" => "Starkes Passwort",
 "Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Saving..." => "Speichern...",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
 "Unable to remove user" => "Benutzer konnte nicht entfernt werden.",
@@ -53,12 +70,18 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Warnungen, Fehler und fatale Probleme",
 "Errors and fatal issues" => "Fehler und fatale Probleme",
 "Fatal issues only" => "Nur fatale Probleme",
+"None" => "Nichts",
+"Login" => "Anmelden",
+"Plain" => "Plain",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Sicherheitswarnung",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, das stattdessen HTTPS verlangt wird.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Dein Datenverzeichnis und deine Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte überprüfe die <a href=\"%s\">Installationsanleitungen</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte prüfe nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
 "Module 'fileinfo' missing" => "Modul 'fileinfo' fehlt ",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
 "Your PHP version is outdated" => "Deine PHP-Version ist veraltet",
@@ -70,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Keine Netzwerkverbindung",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+"Cron was not executed yet!" => "Cron wurde bis jetzt noch nicht ausgeführt!",
 "Execute one task with each page loaded" => "Führe eine Aufgabe mit jeder geladenen Seite aus",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Benutze den System-Crondienst um die cron.php alle 15 Minuten aufzurufen.",
@@ -79,7 +105,7 @@ $TRANSLATIONS = array(
 "Allow links" => "Erlaubt Links",
 "Allow users to share items to the public with links" => "Erlaubt Benutzern, Inhalte über öffentliche Links zu teilen",
 "Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
+"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen",
 "Allow resharing" => "Erlaubt erneutes Teilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
@@ -88,8 +114,19 @@ $TRANSLATIONS = array(
 "Allow user to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "Erzwinge HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
+"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+"Email Server" => "E-Mail-Server",
+"This is used for sending out notifications." => "Dies wird zum Senden von Benachrichtigungen verwendet.",
+"From address" => "Absender-Adresse",
+"Authentication required" => "Authentifizierung benötigt",
+"Server address" => "Adresse des Servers",
+"Port" => "Port",
+"Credentials" => "Zugangsdaten",
+"SMTP Username" => "SMTP Benutzername",
+"SMTP Password" => "SMTP Passwor",
+"Test email settings" => "Teste E-Mail-Einstellunge",
+"Send email" => "Sende E-Mail",
 "Log" => "Log",
 "Log level" => "Loglevel",
 "More" => "Mehr",
@@ -99,9 +136,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Füge Deine Anwendung hinzu",
 "More Apps" => "Weitere Anwendungen",
 "Select an App" => "Wähle eine Anwendung aus",
+"Documentation:" => "Dokumentation:",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com",
+"See application website" => "Siehe Anwendungs-Website",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"User Documentation" => "Dokumentation für Benutzer",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
@@ -109,7 +147,7 @@ $TRANSLATIONS = array(
 "Commercial Support" => "Kommerzieller Support",
 "Get the apps to sync your files" => "Lade die Apps zur Synchronisierung Deiner Daten herunter",
 "Show First Run Wizard again" => "Erstinstallation erneut durchführen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s<strong>",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du verwendest <strong>%s</strong> der verfügbaren <strong>%s</strong>",
 "Password" => "Passwort",
 "Your password was changed" => "Dein Passwort wurde geändert.",
 "Unable to change your password" => "Passwort konnte nicht geändert werden",
@@ -119,20 +157,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Vollständiger Name",
 "Email" => "E-Mail",
 "Your email address" => "Deine E-Mail-Adresse",
-"Fill in an email address to enable password recovery" => "Trage eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Fill in an email address to enable password recovery and receive notifications" => "Gib eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
 "Profile picture" => "Profilbild",
 "Upload new" => "Neues hochladen",
 "Select new from Files" => "Neues aus den Dateien wählen",
 "Remove image" => "Bild entfernen",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden.",
 "Your avatar is provided by your original account." => "Dein Avatar wird von Deinem ursprünglichenKonto verwendet.",
-"Abort" => "Abbrechen",
+"Cancel" => "Abbrechen",
 "Choose as profile image" => "Als Profilbild wählen",
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Übersetzung",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
-"Encryption" => "Verschlüsselung",
 "The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.",
 "Log-in password" => "Login-Passwort",
 "Decrypt all Files" => "Alle Dateien entschlüsseln",
diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php
index d70f365826..d31b9ad151 100644
--- a/settings/l10n/de_AT.php
+++ b/settings/l10n/de_AT.php
@@ -1,5 +1,12 @@
 <?php
 $TRANSLATIONS = array(
-"__language_name__" => "Deutsch (Österreich)"
+"Invalid request" => "Fehlerhafte Anfrage",
+"Delete" => "Löschen",
+"__language_name__" => "Deutsch (Österreich)",
+"Server address" => "Adresse des Servers",
+"Password" => "Passwort",
+"Email" => "E-Mail",
+"Cancel" => "Abbrechen",
+"Other" => "Anderes"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index c313cd18b4..9bfe06d023 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email gesendet",
+"Encryption" => "Verschlüsselung",
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Group already exists" => "Die Gruppe existiert bereits",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
 "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
 "Couldn't update app." => "Die App konnte nicht aktualisiert werden.",
+"User Documentation" => "Dokumentation für Benutzer",
 "Update to {appversion}" => "Update zu {appversion}",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
@@ -26,7 +29,6 @@ $TRANSLATIONS = array(
 "Update" => "Update durchführen",
 "Updated" => "Aktualisiert",
 "Decrypting files... Please wait, this can take some time." => "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Saving..." => "Speichern...",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
 "Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
@@ -38,6 +40,7 @@ $TRANSLATIONS = array(
 "Error creating user" => "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
 "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "__language_name__" => "Deutsch (Schweiz)",
+"Login" => "Anmelden",
 "Security Warning" => "Sicherheitshinweis",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
 "Setup Warning" => "Einrichtungswarnung",
@@ -65,6 +68,8 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "HTTPS erzwingen",
 "Forces the clients to connect to %s via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+"Server address" => "Adresse des Servers",
+"Port" => "Port",
 "Log" => "Log",
 "Log level" => "Log-Level",
 "More" => "Mehr",
@@ -76,7 +81,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Wählen Sie eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"User Documentation" => "Dokumentation für Benutzer",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
@@ -93,11 +97,10 @@ $TRANSLATIONS = array(
 "Change password" => "Passwort ändern",
 "Email" => "E-Mail",
 "Your email address" => "Ihre E-Mail-Adresse",
-"Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Cancel" => "Abbrechen",
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Übersetzung",
 "WebDAV" => "WebDAV",
-"Encryption" => "Verschlüsselung",
 "Log-in password" => "Login-Passwort",
 "Decrypt all Files" => "Alle Dateien entschlüsseln",
 "Login Name" => "Loginname",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index ce349b5fcb..0b30cc0c19 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Ungültiger Wert für %s übermittelt",
+"Saved" => "Gespeichert",
+"test email settings" => "E-Mail-Einstellungen testen",
+"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
+"Email sent" => "Email gesendet",
+"You need to set your user email before being able to send test emails." => "Sie müssen Ihre Benutzer-E-Mail-Adresse setzen, bevor Sie Test-E-Mails versenden können.",
+"Send mode" => "Sende-Modus",
+"Encryption" => "Verschlüsselung",
+"Authentication method" => "Authentifizierungsmethode",
 "Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Your full name has been changed." => "Ihr vollständiger Name ist geändert worden.",
@@ -17,11 +27,14 @@ $TRANSLATIONS = array(
 "Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
 "Couldn't update app." => "Die App konnte nicht aktualisiert werden.",
 "Wrong password" => "Falsches Passwort",
-"No user supplied" => "Keinen Benutzer übermittelt",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können",
+"No user supplied" => "Keinen Benutzer angegeben",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzerdaten verloren gehen können",
 "Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
 "Unable to change password" => "Passwort konnte nicht geändert werden",
+"Sending..." => "Sende...",
+"User Documentation" => "Dokumentation für Benutzer",
+"Admin Documentation" => "Dokumentation für Administratoren",
 "Update to {appversion}" => "Update zu {appversion}",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Update durchführen",
 "Updated" => "Aktualisiert",
 "Select a profile picture" => "Wählen Sie ein Profilbild",
+"Very weak password" => "Sehr schwaches Passwort",
+"Weak password" => "Schwaches Passwort",
+"So-so password" => "Passables Passwort",
+"Good password" => "Gutes Passwort",
+"Strong password" => "Starkes Passwort",
 "Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Saving..." => "Speichern...",
 "deleted" => "gelöscht",
 "undo" => "rückgängig machen",
 "Unable to remove user" => "Der Benutzer konnte nicht entfernt werden.",
@@ -52,13 +69,19 @@ $TRANSLATIONS = array(
 "Info, warnings, errors and fatal issues" => "Infos, Warnungen, Fehler und fatale Probleme",
 "Warnings, errors and fatal issues" => "Warnungen, Fehler und fatale Probleme",
 "Errors and fatal issues" => "Fehler und fatale Probleme",
-"Fatal issues only" => "Nur fatale Probleme",
+"Fatal issues only" => "Nur kritische Fehler",
+"None" => "Keine",
+"Login" => "Anmelden",
+"Plain" => "Plain",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Sicherheitshinweis",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Sie greifen auf %s via HTTP zu. Wir empfehlen Ihnen dringend, Ihren Server so konfigurieren, das stattdessen HTTPS verlangt wird.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ihr Datenverzeichnis und Ihre Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
 "Setup Warning" => "Einrichtungswarnung",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
-"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte überprüfen Sie die <a href=\"%s\">Instalationsanleitungen</a>.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Bitte prüfen Sie nochmals die <a href=\"%s\">Installationsanleitungen</a>.",
 "Module 'fileinfo' missing" => "Das Modul 'fileinfo' fehlt",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
 "Your PHP version is outdated" => "Ihre PHP-Version ist veraltet",
@@ -68,8 +91,11 @@ $TRANSLATIONS = array(
 "This means that there might be problems with certain characters in file names." => "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
 "Internet connection not working" => "Keine Internetverbindung",
-"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen nutzen wollen.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+"Cron was not executed yet!" => "Cron wurde bis jetzt noch nicht ausgeführt!",
 "Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausführen",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
@@ -79,7 +105,7 @@ $TRANSLATIONS = array(
 "Allow links" => "Links erlauben",
 "Allow users to share items to the public with links" => "Benutzern erlauben, Inhalte per öffentlichem Link zu teilen",
 "Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt Benutzern die Freigabe anderer Benutzer in ihren öffentlich freigegebene Ordner hochladen zu dürfen",
+"Allow users to enable others to upload into their publicly shared folders" => "Erlaubt es Benutzern, andere Benutzer einzurichten, dass diese in deren öffentlich freigegebenen Ordner hochladen dürfen",
 "Allow resharing" => "Erlaube Weiterverteilen",
 "Allow users to share items shared with them again" => "Erlaubt Benutzern, mit ihnen geteilte Inhalte erneut zu teilen",
 "Allow users to share with anyone" => "Erlaubt Benutzern, mit jedem zu teilen",
@@ -88,8 +114,19 @@ $TRANSLATIONS = array(
 "Allow user to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
 "Security" => "Sicherheit",
 "Enforce HTTPS" => "HTTPS erzwingen",
-"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
+"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+"Email Server" => "E-Mail-Server",
+"This is used for sending out notifications." => "Dies wird für das Senden von Benachrichtigungen verwendet.",
+"From address" => "Absender-Adresse",
+"Authentication required" => "Authentifizierung benötigt",
+"Server address" => "Adresse des Servers",
+"Port" => "Port",
+"Credentials" => "Zugangsdaten",
+"SMTP Username" => "SMTP Benutzername",
+"SMTP Password" => "SMTP Passwort",
+"Test email settings" => "E-Mail-Einstellungen testen",
+"Send email" => "E-Mail senden",
 "Log" => "Log",
 "Log level" => "Log-Level",
 "More" => "Mehr",
@@ -99,9 +136,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Fügen Sie Ihre Anwendung hinzu",
 "More Apps" => "Weitere Anwendungen",
 "Select an App" => "Wählen Sie eine Anwendung aus",
+"Documentation:" => "Dokumentation:",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
+"See application website" => "Siehe Anwendungs-Website",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
-"User Documentation" => "Dokumentation für Benutzer",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
@@ -119,20 +157,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Vollständiger Name",
 "Email" => "E-Mail",
 "Your email address" => "Ihre E-Mail-Adresse",
-"Fill in an email address to enable password recovery" => "Bitte tragen Sie eine E-Mail-Adresse ein, um die Passwort-Wiederherstellung zu aktivieren.",
+"Fill in an email address to enable password recovery and receive notifications" => "Geben Sie eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
 "Profile picture" => "Profilbild",
 "Upload new" => "Neues hochladen",
-"Select new from Files" => "Neues aus den Dateien wählen",
+"Select new from Files" => "Neues aus Dateien wählen",
 "Remove image" => "Bild entfernen",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden.",
 "Your avatar is provided by your original account." => "Ihr Avatar wird von Ihrerem ursprünglichenKonto verwendet.",
-"Abort" => "Abbrechen",
+"Cancel" => "Abbrechen",
 "Choose as profile image" => "Als Profilbild wählen",
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Übersetzung",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Verwenden Sie diese Adresse, um <a href=\"%s\" target=\"_blank\">via WebDAV auf Ihre Dateien zuzugreifen</a>",
-"Encryption" => "Verschlüsselung",
 "The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten",
 "Log-in password" => "Login-Passwort",
 "Decrypt all Files" => "Alle Dateien entschlüsseln",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index ab285389a5..c438fa0f99 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,5 +1,14 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Αποθηκεύτηκαν",
+"test email settings" => "δοκιμή ρυθμίσεων email",
+"If you received this email, the settings seem to be correct." => "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail. Παρακαλώ ελέγξτε τις ρυθμίσεις σας.",
+"Email sent" => "Το Email απεστάλη ",
+"You need to set your user email before being able to send test emails." => "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
+"Send mode" => "Κατάσταση αποστολής",
+"Encryption" => "Κρυπτογράφηση",
+"Authentication method" => "Μέθοδος πιστοποίησης",
 "Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "Your full name has been changed." => "Το πλήρες όνομά σας άλλαξε.",
@@ -22,6 +31,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.",
 "Unable to change password" => "Αδυναμία αλλαγής συνθηματικού",
+"Sending..." => "Αποστέλεται...",
+"User Documentation" => "Τεκμηρίωση Χρήστη",
+"Admin Documentation" => "Τεκμηρίωση Διαχειριστή",
 "Update to {appversion}" => "Ενημέρωση σε {appversion}",
 "Disable" => "Απενεργοποίηση",
 "Enable" => "Ενεργοποίηση",
@@ -34,8 +46,11 @@ $TRANSLATIONS = array(
 "Update" => "Ενημέρωση",
 "Updated" => "Ενημερώθηκε",
 "Select a profile picture" => "Επιλογή εικόνας προφίλ",
+"Very weak password" => "Πολύ αδύναμο συνθηματικό",
+"Weak password" => "Αδύναμο συνθηματικό",
+"Good password" => "Καλό συνθηματικό",
+"Strong password" => "Δυνατό συνθηματικό",
 "Decrypting files... Please wait, this can take some time." => "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
-"Saving..." => "Γίνεται αποθήκευση...",
 "deleted" => "διαγράφηκε",
 "undo" => "αναίρεση",
 "Unable to remove user" => "Αδυναμία αφαίρεση χρήστη",
@@ -53,6 +68,11 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
 "Errors and fatal issues" => "Σφάλματα και καίρια ζητήματα",
 "Fatal issues only" => "Καίρια ζητήματα μόνο",
+"None" => "Τίποτα",
+"Login" => "Σύνδεση",
+"NT LAN Manager" => "Διαχειριστης NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Έχετε πρόσβαση στο %s μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί χρήση 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." => "Ο κατάλογος δεδομένων και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων έξω από τη ρίζα του καταλόγου του διακομιστή.",
@@ -90,26 +110,38 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Επιβολή χρήσης HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Επιβάλλει τους δέκτες να συνδέονται με το %s μέσω κρυπογραφημένης σύνδεσης.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL.",
+"Email Server" => "Διακομιστής Email",
+"This is used for sending out notifications." => "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
+"From address" => "Από τη διεύθυνση",
+"Authentication required" => "Απαιτείται πιστοποίηση",
+"Server address" => "Διεύθυνση διακομιστή",
+"Port" => "Θύρα",
+"Credentials" => "Πιστοποιητικά",
+"SMTP Username" => "Όνομα χρήστη SMTP",
+"SMTP Password" => "Συνθηματικό SMTP",
+"Test email settings" => "Δοκιμή ρυθμίσεων email",
+"Send email" => "Αποστολή email",
 "Log" => "Καταγραφές",
 "Log level" => "Επίπεδο καταγραφής",
 "More" => "Περισσότερα",
 "Less" => "Λιγότερα",
 "Version" => "Έκδοση",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>, ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Πρόσθεστε τη Δικιά σας Εφαρμογή",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>. Ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"Add your App" => "Προσθέστε Δικιά σας Εφαρμογή",
 "More Apps" => "Περισσότερες Εφαρμογές",
 "Select an App" => "Επιλέξτε μια Εφαρμογή",
+"Documentation:" => "Τεκμηρίωση:",
 "See application page at apps.owncloud.com" => "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-άδεια από <span class=\"author\"></span>",
-"User Documentation" => "Τεκμηρίωση Χρήστη",
+"See application website" => "Δείτε την ιστοσελίδα της εφαρμογής",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Άδεια χρήσης <span class=\"licence\"></span> από <span class=\"author\"></span>",
 "Administrator Documentation" => "Τεκμηρίωση Διαχειριστή",
 "Online Documentation" => "Τεκμηρίωση στο Διαδίκτυο",
 "Forum" => "Φόρουμ",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Εμπορική Υποστήριξη",
 "Get the apps to sync your files" => "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
-"Show First Run Wizard again" => "Προβολή Πρώτης Εκτέλεσης Οδηγού πάλι",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από διαθέσιμα <strong>%s</strong>",
+"Show First Run Wizard again" => "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από τα <strong>%s</strong> διαθέσιμα",
 "Password" => "Συνθηματικό",
 "Your password was changed" => "Το συνθηματικό σας έχει αλλάξει",
 "Unable to change your password" => "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
@@ -117,22 +149,21 @@ $TRANSLATIONS = array(
 "New password" => "Νέο συνθηματικό",
 "Change password" => "Αλλαγή συνθηματικού",
 "Full Name" => "Πλήρες όνομα",
-"Email" => "Ηλ. ταχυδρομείο",
-"Your email address" => "Η διεύθυνση ηλεκτρονικού ταχυδρομείου σας",
-"Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού",
+"Email" => "Ηλεκτρονικό ταχυδρομείο",
+"Your email address" => "Η διεύθυνση ηλ. ταχυδρομείου σας",
+"Fill in an email address to enable password recovery and receive notifications" => "Συμπληρώστε μια διεύθυνση email για να ενεργοποιήσετε την επαναφορά συνθηματικού και να λαμβάνετε ειδοποιήσεις",
 "Profile picture" => "Φωτογραφία προφίλ",
 "Upload new" => "Μεταφόρτωση νέου",
 "Select new from Files" => "Επιλογή νέου από τα Αρχεία",
 "Remove image" => "Αφαίρεση εικόνας",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Είτε png ή jpg. Ιδανικά τετράγωνη αλλά θα είστε σε θέση να την περικόψετε.",
 "Your avatar is provided by your original account." => "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό.",
-"Abort" => "Ματαίωση",
+"Cancel" => "Άκυρο",
 "Choose as profile image" => "Επιλογή εικόνας προφίλ",
 "Language" => "Γλώσσα",
 "Help translate" => "Βοηθήστε στη μετάφραση",
 "WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρήση αυτής της διεύθυνσης <a href=\"%s\" target=\"_blank\">πρόσβαση των Αρχείων σας μέσω WebDAV</a>",
-"Encryption" => "Κρυπτογράφηση",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Χρησιμοποιήστε αυτήν την διεύθυνση για να αποκτήσετε <a href=\"%s\" target=\"_blank\">πρόσβαση στα αρχεία σας μέσω WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
 "Log-in password" => "Συνθηματικό εισόδου",
 "Decrypt all Files" => "Αποκρυπτογράφηση όλων των Αρχείων",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 5f7b6e1fe0..b377a6b338 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Invalid value supplied for %s",
+"Saved" => "Saved",
+"test email settings" => "test email settings",
+"If you received this email, the settings seem to be correct." => "If you received this email, the settings seem to be correct.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "A problem occurred whilst sending the e-mail. Please revisit your settings.",
+"Email sent" => "Email sent",
+"You need to set your user email before being able to send test emails." => "You need to set your user email before being able to send test emails.",
+"Send mode" => "Send mode",
+"Encryption" => "Encryption",
+"Authentication method" => "Authentication method",
 "Unable to load list from App Store" => "Unable to load list from App Store",
 "Authentication error" => "Authentication error",
 "Your full name has been changed." => "Your full name has been changed.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Incorrect admin recovery password. Please check the password and try again.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end doesn't support password change, but the user's encryption key was successfully updated.",
 "Unable to change password" => "Unable to change password",
+"Sending..." => "Sending...",
+"User Documentation" => "User Documentation",
+"Admin Documentation" => "Admin Documentation",
 "Update to {appversion}" => "Update to {appversion}",
 "Disable" => "Disable",
 "Enable" => "Enable",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Update",
 "Updated" => "Updated",
 "Select a profile picture" => "Select a profile picture",
+"Very weak password" => "Very weak password",
+"Weak password" => "Weak password",
+"So-so password" => "So-so password",
+"Good password" => "Good password",
+"Strong password" => "Strong password",
 "Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
-"Saving..." => "Saving...",
 "deleted" => "deleted",
 "undo" => "undo",
 "Unable to remove user" => "Unable to remove user",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Warnings, errors and fatal issues",
 "Errors and fatal issues" => "Errors and fatal issues",
 "Fatal issues only" => "Fatal issues only",
+"None" => "None",
+"Login" => "Login",
+"Plain" => "Plain",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Security Warning",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.",
 "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." => "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.",
@@ -70,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Internet connection not working",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don't work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Last cron was executed at %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
+"Cron was not executed yet!" => "Cron was not executed yet!",
 "Execute one task with each page loaded" => "Execute one task with each page loaded",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php is registered at a webcron service to call cron.php every 15 minutes over http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Use system's cron service to call the cron.php file every 15 minutes.",
@@ -90,6 +116,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Enforce HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
+"Email Server" => "Email Server",
+"This is used for sending out notifications." => "This is used for sending out notifications.",
+"From address" => "From address",
+"Authentication required" => "Authentication required",
+"Server address" => "Server address",
+"Port" => "Port",
+"Credentials" => "Credentials",
+"SMTP Username" => "SMTP Username",
+"SMTP Password" => "SMTP Password",
+"Test email settings" => "Test email settings",
+"Send email" => "Send email",
 "Log" => "Log",
 "Log level" => "Log level",
 "More" => "More",
@@ -99,9 +136,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Add your App",
 "More Apps" => "More Apps",
 "Select an App" => "Select an App",
+"Documentation:" => "Documentation:",
 "See application page at apps.owncloud.com" => "See application page at apps.owncloud.com",
+"See application website" => "See application website",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
-"User Documentation" => "User Documentation",
 "Administrator Documentation" => "Administrator Documentation",
 "Online Documentation" => "Online Documentation",
 "Forum" => "Forum",
@@ -119,20 +157,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Full Name",
 "Email" => "Email",
 "Your email address" => "Your email address",
-"Fill in an email address to enable password recovery" => "Fill in an email address to enable password recovery",
+"Fill in an email address to enable password recovery and receive notifications" => "Fill in an email address to enable password recovery and receive notifications",
 "Profile picture" => "Profile picture",
 "Upload new" => "Upload new",
 "Select new from Files" => "Select new from Files",
 "Remove image" => "Remove image",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Either png or jpg. Ideally square but you will be able to crop it.",
 "Your avatar is provided by your original account." => "Your avatar is provided by your original account.",
-"Abort" => "Abort",
+"Cancel" => "Cancel",
 "Choose as profile image" => "Choose as profile image",
 "Language" => "Language",
 "Help translate" => "Help translate",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>",
-"Encryption" => "Encryption",
 "The encryption app is no longer enabled, please decrypt all your files" => "The encryption app is no longer enabled, please decrypt all your files",
 "Log-in password" => "Log-in password",
 "Decrypt all Files" => "Decrypt all Files",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 4c797e1a8d..f63c5140a4 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "La retpoŝtaĵo sendiĝis",
+"Encryption" => "Ĉifrado",
 "Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
 "Authentication error" => "Aŭtentiga eraro",
 "Group already exists" => "La grupo jam ekzistas",
@@ -13,17 +15,19 @@ $TRANSLATIONS = array(
 "Admins can't remove themself from the admin group" => "Administrantoj ne povas forigi sin mem el la administra grupo.",
 "Unable to add user to group %s" => "Ne eblis aldoni la uzanton al la grupo %s",
 "Unable to remove user from group %s" => "Ne eblis forigi la uzantan el la grupo %s",
+"User Documentation" => "Dokumentaro por uzantoj",
 "Disable" => "Malkapabligi",
 "Enable" => "Kapabligi",
 "Error" => "Eraro",
 "Update" => "Ĝisdatigi",
-"Saving..." => "Konservante...",
 "deleted" => "forigita",
 "undo" => "malfari",
 "Groups" => "Grupoj",
 "Group Admin" => "Grupadministranto",
 "Delete" => "Forigi",
 "__language_name__" => "Esperanto",
+"None" => "Nenio",
+"Login" => "Ensaluti",
 "Security Warning" => "Sekureca averto",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
 "Cron" => "Cron",
@@ -36,6 +40,9 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Kapabligi uzantojn rekunhavigi erojn kunhavigitajn kun ili",
 "Allow users to share with anyone" => "Kapabligi uzantojn kunhavigi kun ĉiu ajn",
 "Allow users to only share with users in their groups" => "Kapabligi uzantojn nur kunhavigi kun uzantoj el siaj grupoj",
+"Server address" => "Servila adreso",
+"Port" => "Pordo",
+"Credentials" => "Aŭtentigiloj",
 "Log" => "Protokolo",
 "Log level" => "Registronivelo",
 "More" => "Pli",
@@ -47,7 +54,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Elekti aplikaĵon",
 "See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
-"User Documentation" => "Dokumentaro por uzantoj",
 "Administrator Documentation" => "Dokumentaro por administrantoj",
 "Online Documentation" => "Reta dokumentaro",
 "Forum" => "Forumo",
@@ -63,12 +69,12 @@ $TRANSLATIONS = array(
 "Change password" => "Ŝanĝi la pasvorton",
 "Email" => "Retpoŝto",
 "Your email address" => "Via retpoŝta adreso",
-"Fill in an email address to enable password recovery" => "Enigu retpoŝtadreson por kapabligi pasvortan restaŭron",
 "Profile picture" => "Profila bildo",
+"Cancel" => "Nuligi",
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
 "WebDAV" => "WebDAV",
-"Encryption" => "Ĉifrado",
+"Login Name" => "Ensaluti",
 "Create" => "Krei",
 "Default Storage" => "Defaŭlta konservejo",
 "Unlimited" => "Senlima",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index fbd9840982..ec6e3b3bd6 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Se introdujo un valor inválido para %s",
+"Saved" => "Guardado",
+"test email settings" => "probar configuración de correo",
+"If you received this email, the settings seem to be correct." => "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Ocurrió un problema la enviar el mensaje. Revise la configuración.",
+"Email sent" => "Correo electrónico enviado",
+"You need to set your user email before being able to send test emails." => "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
+"Send mode" => "Modo de envío",
+"Encryption" => "Cifrado",
+"Authentication method" => "Método de autenticación",
 "Unable to load list from App Store" => "No se pudo cargar la lista desde el App Store",
 "Authentication error" => "Error de autenticación",
 "Your full name has been changed." => "Se ha cambiado su nombre completo.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
 "Unable to change password" => "No se ha podido cambiar la contraseña",
+"Sending..." => "Enviando...",
+"User Documentation" => "Documentación de usuario",
+"Admin Documentation" => "Documentación para administradores",
 "Update to {appversion}" => "Actualizado a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccionar una imagen de perfil",
+"Very weak password" => "Contraseña muy débil",
+"Weak password" => "Contraseña débil",
+"So-so password" => "Contraseña pasable",
+"Good password" => "Contraseña buena",
+"Strong password" => "Contraseña muy buena",
 "Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
-"Saving..." => "Guardando...",
 "deleted" => "eliminado",
 "undo" => "deshacer",
 "Unable to remove user" => "Imposible eliminar al usuario",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Advertencias, errores y problemas fatales",
 "Errors and fatal issues" => "Errores y problemas fatales",
 "Fatal issues only" => "Problemas fatales solamente",
+"None" => "Ninguno",
+"Login" => "Iniciar sesión",
+"Plain" => "Plano",
+"NT LAN Manager" => "Gestor de NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Advertencia de seguridad",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera 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." => "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
@@ -61,7 +84,7 @@ $TRANSLATIONS = array(
 "Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
 "Module 'fileinfo' missing" => "No se ha encontrado el módulo \"fileinfo\"",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "No se ha encontrado el modulo PHP 'fileinfo'. Le recomendamos encarecidamente que habilite este módulo para obtener mejores resultados con la detección de tipos MIME.",
-"Your PHP version is outdated" => "Su versión de PHP ha caducado",
+"Your PHP version is outdated" => "Su versión de PHP no está actualizada",
 "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." => "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello.",
 "Locale not working" => "La configuración regional no está funcionando",
 "System locale can not be set to a one which supports UTF-8." => "No se puede escoger una configuración regional que soporte UTF-8.",
@@ -70,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "La conexión a Internet no está funcionando",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Cron fue ejecutado por última vez a las %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
+"Cron was not executed yet!" => "¡Cron aún no ha sido ejecutado!",
 "Execute one task with each page loaded" => "Ejecutar una tarea con cada página cargada",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php se registra en un servicio webcron para llamar a cron.php cada 15 minutos a través de HTTP.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Utiliza el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
@@ -90,6 +116,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
+"Email Server" => "Servidor de correo electrónico",
+"This is used for sending out notifications." => "Esto se usa para enviar notificaciones.",
+"From address" => "Desde la dirección",
+"Authentication required" => "Se necesita autenticación",
+"Server address" => "Dirección del servidor",
+"Port" => "Puerto",
+"Credentials" => "Credenciales",
+"SMTP Username" => "Nombre de usuario SMTP",
+"SMTP Password" => "Contraseña SMTP",
+"Test email settings" => "Probar configuración de correo electrónico",
+"Send email" => "Enviar mensaje",
 "Log" => "Registro",
 "Log level" => "Nivel de registro",
 "More" => "Más",
@@ -99,9 +136,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Añade tu aplicación",
 "More Apps" => "Más aplicaciones",
 "Select an App" => "Seleccionar una aplicación",
+"Documentation:" => "Documentación:",
 "See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
+"See application website" => "Ver sitio web de la aplicación",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
-"User Documentation" => "Documentación de usuario",
 "Administrator Documentation" => "Documentación de administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
@@ -119,20 +157,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Nombre completo",
 "Email" => "Correo electrónico",
 "Your email address" => "Su dirección de correo",
-"Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña",
+"Fill in an email address to enable password recovery and receive notifications" => "Introducir una dirección de correo electrónico  para activar la recuperación de contraseñas y recibir notificaciones",
 "Profile picture" => "Foto de perfil",
 "Upload new" => "Subir otra",
 "Select new from Files" => "Seleccionar otra desde Archivos",
 "Remove image" => "Borrar imagen",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo.",
 "Your avatar is provided by your original account." => "Su avatar es proporcionado por su cuenta original.",
-"Abort" => "Cancelar",
+"Cancel" => "Cancelar",
 "Choose as profile image" => "Seleccionar como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayúdanos a traducir",
 "WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
-"Encryption" => "Cifrado",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para<a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a sus archivos a través de WebDAV</a>",
 "The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
 "Log-in password" => "Contraseña de acceso",
 "Decrypt all Files" => "Descifrar archivos",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 44c9964778..b637dd4f14 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,7 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "e-mail mandado",
+"Encryption" => "Encriptación",
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error al autenticar",
+"Your full name has been changed." => "Su nombre completo ha sido cambiado.",
+"Unable to change full name" => "Imposible cambiar el nombre completo",
 "Group already exists" => "El grupo ya existe",
 "Unable to add group" => "No fue posible añadir el grupo",
 "Email saved" => "e-mail guardado",
@@ -14,6 +18,13 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "No fue posible agregar el usuario al grupo %s",
 "Unable to remove user from group %s" => "No es posible borrar al usuario del grupo %s",
 "Couldn't update app." => "No se pudo actualizar la App.",
+"Wrong password" => "Clave incorrecta",
+"No user supplied" => "No se ha indicado el usuario",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor provea de una contraseña de recuperación administrativa, sino se perderá todos los datos del usuario",
+"Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente.",
+"Unable to change password" => "Imposible cambiar la contraseña",
+"User Documentation" => "Documentación de Usuario",
 "Update to {appversion}" => "Actualizar a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -25,8 +36,8 @@ $TRANSLATIONS = array(
 "Error" => "Error",
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
+"Select a profile picture" => "Seleccionar una imágen de perfil",
 "Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
-"Saving..." => "Guardando...",
 "deleted" => "borrado",
 "undo" => "deshacer",
 "Unable to remove user" => "Imposible borrar usuario",
@@ -37,19 +48,35 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "Debe ingresar un nombre de usuario válido",
 "Error creating user" => "Error creando usuario",
 "A valid password must be provided" => "Debe ingresar una contraseña válida",
+"Warning: Home directory for user \"{user}\" already exists" => "Advertencia: El directorio Home del usuario \"{user}\" ya existe",
 "__language_name__" => "Castellano (Argentina)",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Todo (notificaciones fatales, errores, advertencias, info, debug)",
+"Info, warnings, errors and fatal issues" => "Info, advertencias, errores y notificaciones fatales",
+"Warnings, errors and fatal issues" => "Advertencias, errores y notificaciones fatales",
+"Errors and fatal issues" => "Errores y notificaciones fatales",
+"Fatal issues only" => "Notificaciones fatales solamente",
+"None" => "Ninguno",
+"Login" => "Ingresar",
 "Security Warning" => "Advertencia de seguridad",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está accediendo %s vía HTTP. Se sugiere fuertemente que configure su servidor para requerir el uso de HTTPS en vez del otro.",
 "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." => "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web.",
 "Setup Warning" => "Alerta de Configuración",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, cheque bien la <a href=\"%s\">guía de instalación</a>.",
 "Module 'fileinfo' missing" => "El módulo 'fileinfo' no existe",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type",
+"Your PHP version is outdated" => "Su versión de PHP está fuera de término",
+"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." => "Su versión de PHP está fuera de término. Recomendamos fuertemente actualizar a 5.3.8 o a una más nueva porque se sabe que versiones anteriores están falladas. Es posible que esta instalación no funcione adecuadamente.",
 "Locale not working" => "\"Locale\" no está funcionando",
+"System locale can not be set to a one which supports UTF-8." => "La localización del sistema no puede cambiarse a una que soporta UTF-8",
+"This means that there might be problems with certain characters in file names." => "Esto significa que puede haber problemas con ciertos caracteres en los nombres de archivos.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s.",
 "Internet connection not working" => "La conexión a Internet no esta funcionando. ",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Ejecutá una tarea con cada pagina cargada.",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
+"Use systems cron service to call the cron.php file every 15 minutes." => "Usar el servicio cron del sistema para llamar al archivo cron.php cada 15 minutos.",
 "Sharing" => "Compartiendo",
 "Enable Share API" => "Habilitar Share API",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
@@ -61,10 +88,15 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Permite a los usuarios volver a compartir items que les fueron compartidos",
 "Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera.",
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los de sus mismos grupos",
+"Allow mail notification" => "Permitir notificaciones por correo",
+"Allow user to send mail notification for shared files" => "Permitir al usuario enviar notificaciones por correo para archivos compartidos",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
+"Server address" => "Dirección del servidor",
+"Port" => "Puerto",
+"Credentials" => "Credenciales",
 "Log" => "Log",
 "Log level" => "Nivel de Log",
 "More" => "Más",
@@ -76,7 +108,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Elegí una App",
 "See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\">",
-"User Documentation" => "Documentación de Usuario",
 "Administrator Documentation" => "Documentación de Administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
@@ -91,14 +122,22 @@ $TRANSLATIONS = array(
 "Current password" => "Contraseña actual",
 "New password" => "Nueva contraseña:",
 "Change password" => "Cambiar contraseña",
+"Full Name" => "Nombre completo",
 "Email" => "e-mail",
 "Your email address" => "Tu dirección de e-mail",
-"Fill in an email address to enable password recovery" => "Escribí una dirección de e-mail para restablecer la contraseña",
-"Abort" => "Abortar",
+"Profile picture" => "Imágen de perfil",
+"Upload new" => "Subir nuevo",
+"Select new from Files" => "Seleccionar nuevo desde archivos",
+"Remove image" => "Remover imagen",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Sólo png o jpg. Lo ideal que sea cuadrada sino luego podrás recortarlo.",
+"Your avatar is provided by your original account." => "Su avatar es proveído por su cuenta original.",
+"Cancel" => "Cancelar",
+"Choose as profile image" => "Elegir como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayudanos a traducir",
 "WebDAV" => "WebDAV",
-"Encryption" => "Encriptación",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Usar esta dirección para <a href=\"%s\" target=\"_blank\">acceder a tus archivos vía WebDAV</a>",
+"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
 "Log-in password" => "Clave de acceso",
 "Decrypt all Files" => "Desencriptar todos los archivos",
 "Login Name" => "Nombre de Usuario",
@@ -106,10 +145,12 @@ $TRANSLATIONS = array(
 "Admin Recovery Password" => "Recuperación de contraseña de administrador",
 "Enter the recovery password in order to recover the users files during password change" => "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
 "Default Storage" => "Almacenamiento Predeterminado",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor ingrese la cuota de almacenamiento (ej.: \"512 MB\" o \"12 GB\")",
 "Unlimited" => "Ilimitado",
 "Other" => "Otros",
 "Username" => "Nombre de usuario",
 "Storage" => "Almacenamiento",
+"change full name" => "Cambiar nombre completo",
 "set new password" => "Configurar nueva contraseña",
 "Default" => "Predeterminado"
 );
diff --git a/settings/l10n/es_CL.php b/settings/l10n/es_CL.php
index 86e66bd482..bdf34e6297 100644
--- a/settings/l10n/es_CL.php
+++ b/settings/l10n/es_CL.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Error" => "Error",
 "Password" => "Clave",
+"Cancel" => "Cancelar",
 "Username" => "Usuario"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 520ab637ff..abfeaa577d 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Correo electrónico enviado",
+"Encryption" => "Cifrado",
 "Unable to load list from App Store" => "No se pudo cargar la lista desde el App Store",
 "Authentication error" => "Error de autenticación",
 "Your full name has been changed." => "Se ha cambiado su nombre completo.",
@@ -22,6 +24,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación de administrador incorrecta. Por favor compruebe la contraseña e inténtelo de nuevo.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
 "Unable to change password" => "No se ha podido cambiar la contraseña",
+"User Documentation" => "Documentación de usuario",
 "Update to {appversion}" => "Actualizado a {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -35,7 +38,6 @@ $TRANSLATIONS = array(
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccionar una imagen de perfil",
 "Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
-"Saving..." => "Guardando...",
 "deleted" => "eliminado",
 "undo" => "deshacer",
 "Unable to remove user" => "Imposible eliminar al usuario",
@@ -53,6 +55,7 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Advertencias, errores y problemas fatales",
 "Errors and fatal issues" => "Errores y problemas fatales",
 "Fatal issues only" => "Problemas fatales solamente",
+"Login" => "Iniciar sesión",
 "Security Warning" => "Advertencia de seguridad",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera 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." => "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
@@ -90,6 +93,8 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
+"Server address" => "Dirección del servidor",
+"Port" => "Puerto",
 "Log" => "Registro",
 "Log level" => "Nivel de registro",
 "More" => "Más",
@@ -101,7 +106,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Seleccionar una aplicación",
 "See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
-"User Documentation" => "Documentación de usuario",
 "Administrator Documentation" => "Documentación de administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
@@ -119,20 +123,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Nombre completo",
 "Email" => "Correo electrónico",
 "Your email address" => "Su dirección de correo",
-"Fill in an email address to enable password recovery" => "Escriba una dirección de correo electrónico para restablecer la contraseña",
 "Profile picture" => "Foto de perfil",
 "Upload new" => "Subir otra",
 "Select new from Files" => "Seleccionar otra desde Archivos",
 "Remove image" => "Borrar imagen",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo.",
 "Your avatar is provided by your original account." => "Su avatar es proporcionado por su cuenta original.",
-"Abort" => "Cancelar",
+"Cancel" => "Cancelar",
 "Choose as profile image" => "Seleccionar como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayúdanos a traducir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilice esta dirección para <a href=\"%s\" target=\"_blank\">acceder a sus archivos vía WebDAV</a>",
-"Encryption" => "Cifrado",
 "The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
 "Log-in password" => "Contraseña de acceso",
 "Decrypt all Files" => "Descifrar archivos",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index f543652582..c294fcc137 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "E-kiri on saadetud",
+"Encryption" => "Krüpteerimine",
 "Unable to load list from App Store" => "App Store'i nimekirja laadimine ebaõnnestus",
 "Authentication error" => "Autentimise viga",
 "Your full name has been changed." => "Sinu täispikk nimi on muudetud.",
@@ -22,6 +24,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.",
 "Unable to change password" => "Ei suuda parooli muuta",
+"User Documentation" => "Kasutaja dokumentatsioon",
 "Update to {appversion}" => "Uuenda versioonile {appversion}",
 "Disable" => "Lülita välja",
 "Enable" => "Lülita sisse",
@@ -35,7 +38,6 @@ $TRANSLATIONS = array(
 "Updated" => "Uuendatud",
 "Select a profile picture" => "Vali profiili pilt",
 "Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
-"Saving..." => "Salvestamine...",
 "deleted" => "kustutatud",
 "undo" => "tagasi",
 "Unable to remove user" => "Kasutaja eemaldamine ebaõnnestus",
@@ -53,6 +55,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Hoiatused, veateated ja tõsised probleemid",
 "Errors and fatal issues" => "Veateated ja tõsised probleemid",
 "Fatal issues only" => "Ainult tõsised probleemid",
+"None" => "Pole",
+"Login" => "Logi sisse",
 "Security Warning" => "Turvahoiatus",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Sa kasutad %s ligipääsuks HTTP protokolli. Soovitame tungivalt seadistada oma server selle asemel kasutama HTTPS-i.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Andmete kataloog ja failid on tõenäoliselt internetis avalikult saadaval. .htaccess fail, ei toimi. Soovitame tungivalt veebiserver seadistada selliselt, et andmete kataloog ei oleks enam vabalt saadaval või tõstaksid andmete kataloogi oma veebiserveri veebi juurkataloogist mujale.",
@@ -90,6 +94,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
 "Forces the clients to connect to %s via an encrypted connection." => "Sunnib kliente %s ühenduma krüpteeritult.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.",
+"Server address" => "Serveri aadress",
+"Port" => "Port",
+"Credentials" => "Kasutajatunnused",
 "Log" => "Logi",
 "Log level" => "Logi tase",
 "More" => "Rohkem",
@@ -101,7 +108,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Vali programm",
 "See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
-"User Documentation" => "Kasutaja dokumentatsioon",
 "Administrator Documentation" => "Administraatori dokumentatsioon",
 "Online Documentation" => "Online dokumentatsioon",
 "Forum" => "Foorum",
@@ -119,20 +125,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Täispikk nimi",
 "Email" => "E-post",
 "Your email address" => "Sinu e-posti aadress",
-"Fill in an email address to enable password recovery" => "Parooli taastamise sisse lülitamiseks sisesta e-posti aadress",
 "Profile picture" => "Profiili pilt",
 "Upload new" => "Laadi uus üles",
 "Select new from Files" => "Vali failidest uus",
 "Remove image" => "Eemalda pilt",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Kas png või jpg. Võimalikult ruudukujuline, kuid sul on võimalus seda veel lõigata.",
 "Your avatar is provided by your original account." => "Sinu avatari pakub sinu algne konto.",
-"Abort" => "Katkesta",
+"Cancel" => "Loobu",
 "Choose as profile image" => "Vali profiilipildiks",
 "Language" => "Keel",
 "Help translate" => "Aita tõlkida",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Kasuta seda aadressi <a href=\"%s\" target=\"_blank\">oma failidele ligipääsuks WebDAV kaudu</a>",
-"Encryption" => "Krüpteerimine",
 "The encryption app is no longer enabled, please decrypt all your files" => "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
 "Log-in password" => "Sisselogimise parool",
 "Decrypt all Files" => "Dekrüpteeri kõik failid",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 0542deee3d..0225fb00f6 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Eposta bidalia",
+"Encryption" => "Enkriptazioa",
 "Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
 "Authentication error" => "Autentifikazio errorea",
 "Your full name has been changed." => "Zure izena aldatu egin da.",
@@ -21,6 +23,7 @@ $TRANSLATIONS = array(
 "Please provide an admin recovery password, otherwise all user data will be lost" => "Mesedez eman berreskuratzeko administrazio  pasahitza, bestela erabiltzaile datu guztiak galduko dira",
 "Wrong admin recovery password. Please check the password and try again." => "Berreskuratze administradore pasahitz ez egokia. Medesez egiaztatu pasahitza eta saiatu berriz.",
 "Unable to change password" => "Ezin izan da pasahitza aldatu",
+"User Documentation" => "Erabiltzaile dokumentazioa",
 "Update to {appversion}" => "Eguneratu {appversion}-ra",
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
@@ -33,7 +36,6 @@ $TRANSLATIONS = array(
 "Update" => "Eguneratu",
 "Updated" => "Eguneratuta",
 "Select a profile picture" => "Profil argazkia aukeratu",
-"Saving..." => "Gordetzen...",
 "deleted" => "ezabatuta",
 "undo" => "desegin",
 "Unable to remove user" => "Ezin izan da erabiltzailea aldatu",
@@ -46,6 +48,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Baliozko pasahitza eman behar da",
 "Warning: Home directory for user \"{user}\" already exists" => "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da",
 "__language_name__" => "Euskera",
+"None" => "Ezer",
+"Login" => "Saio hasiera",
 "Security Warning" => "Segurtasun abisua",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s HTTP bidez erabiltzen ari zara. Aholkatzen dizugu zure zerbitzaria HTTPS erabil dezan.",
 "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." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke.  .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
@@ -82,6 +86,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Behartu HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
+"Server address" => "Zerbitzariaren helbidea",
+"Port" => "Portua",
+"Credentials" => "Kredentzialak",
 "Log" => "Egunkaria",
 "Log level" => "Erregistro maila",
 "More" => "Gehiago",
@@ -93,7 +100,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Aukeratu programa bat",
 "See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
-"User Documentation" => "Erabiltzaile dokumentazioa",
 "Administrator Documentation" => "Administradore dokumentazioa",
 "Online Documentation" => "Online dokumentazioa",
 "Forum" => "Foroa",
@@ -111,19 +117,17 @@ $TRANSLATIONS = array(
 "Full Name" => "Izena",
 "Email" => "E-posta",
 "Your email address" => "Zure e-posta",
-"Fill in an email address to enable password recovery" => "Idatz ezazu e-posta bat pasahitza berreskuratu ahal izateko",
 "Profile picture" => "Profilaren irudia",
 "Upload new" => "Igo berria",
 "Select new from Files" => "Hautatu berria Fitxategietatik",
 "Remove image" => "Irudia ezabatu",
 "Either png or jpg. Ideally square but you will be able to crop it." => "png edo jpg. Hobe karratua baina mozteko aukera izango duzu.",
-"Abort" => "Bertan-behera utzi",
+"Cancel" => "Ezeztatu",
 "Choose as profile image" => "Profil irudi bezala aukeratu",
 "Language" => "Hizkuntza",
 "Help translate" => "Lagundu itzultzen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">helbidea erabili zure fitxategiak WebDAV bidez eskuratzeko</a>",
-"Encryption" => "Enkriptazioa",
 "The encryption app is no longer enabled, please decrypt all your files" => "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
 "Log-in password" => "Saioa hasteko pasahitza",
 "Decrypt all Files" => "Desenkripattu fitxategi guztiak",
diff --git a/settings/l10n/eu_ES.php b/settings/l10n/eu_ES.php
new file mode 100644
index 0000000000..280c7f05c0
--- /dev/null
+++ b/settings/l10n/eu_ES.php
@@ -0,0 +1,8 @@
+<?php
+$TRANSLATIONS = array(
+"Invalid request" => "Eskakizun baliogabea",
+"Delete" => "Ezabatu",
+"Cancel" => "Ezeztatu",
+"Other" => "Bestea"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index e8582868f3..bec91c6970 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "ایمیل ارسال شد",
+"Encryption" => "رمزگذاری",
 "Unable to load list from App Store" => "قادر به بارگذاری لیست از فروشگاه اپ نیستم",
 "Authentication error" => "خطا در اعتبار سنجی",
 "Group already exists" => "این گروه در حال حاضر موجود است",
@@ -14,16 +16,26 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "امکان افزودن کاربر به گروه %s نیست",
 "Unable to remove user from group %s" => "امکان حذف کاربر از گروه %s نیست",
 "Couldn't update app." => "برنامه را نمی توان به هنگام ساخت.",
+"Wrong password" => "رمز عبور اشتباه است",
+"No user supplied" => "هیچ کاربری تعریف نشده است",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "لطفاً یک رمز مدیریتی برای بازیابی کردن تعریف نمایید. در غیر اینصورت اطلاعات تمامی کاربران از دست خواهند رفت.",
+"Wrong admin recovery password. Please check the password and try again." => "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمی‌کند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد.",
+"Unable to change password" => "نمی‌توان رمز را تغییر داد",
+"User Documentation" => "مستندات کاربر",
 "Update to {appversion}" => "بهنگام شده به  {appversion}",
 "Disable" => "غیرفعال",
 "Enable" => "فعال",
 "Please wait...." => "لطفا صبر کنید ...",
+"Error while disabling app" => "خطا در هنگام غیر فعال سازی برنامه",
+"Error while enabling app" => "خطا در هنگام فعال سازی برنامه",
 "Updating...." => "در حال بروز رسانی...",
 "Error while updating app" => "خطا در هنگام بهنگام سازی برنامه",
 "Error" => "خطا",
 "Update" => "به روز رسانی",
 "Updated" => "بروز رسانی انجام شد",
-"Saving..." => "در حال ذخیره سازی...",
+"Select a profile picture" => "انتخاب تصویر پروفایل",
+"Decrypting files... Please wait, this can take some time." => "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
 "deleted" => "حذف شده",
 "undo" => "بازگشت",
 "Unable to remove user" => "حذف کاربر امکان پذیر نیست",
@@ -34,27 +46,44 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "نام کاربری صحیح باید وارد شود",
 "Error creating user" => "خطا در ایجاد کاربر",
 "A valid password must be provided" => "رمز عبور صحیح باید وارد شود",
+"Warning: Home directory for user \"{user}\" already exists" => "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در حال حاضر وجود دارد",
 "__language_name__" => "__language_name__",
+"None" => "هیچ‌کدام",
+"Login" => "ورود",
 "Security Warning" => "اخطار امنیتی",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "به احتمال زیاد پوشه‌ی data و فایل‌های شما از طریق اینترنت قابل دسترسی هستند. فایل .htaccess برنامه کار نمی‌کند. ما شدیداً توصیه می کنیم که شما وب سرور خودتان را طوری تنظیم کنید که پوشه‌ی data شما غیر قابل دسترسی باشد یا اینکه پوشه‌‎ی data را به خارج از ریشه‌ی اصلی وب سرور انتقال دهید.",
 "Setup Warning" => "هشدار راه اندازی",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
 "Module 'fileinfo' missing" => "ماژول 'fileinfo' از کار افتاده",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "ماژول 'fileinfo' PHP از کار افتاده است.ما اکیدا توصیه می کنیم که این ماژول را فعال کنید تا نتایج بهتری به وسیله ی mime-type detection دریافت کنید.",
 "Locale not working" => "زبان محلی کار نمی کند.",
 "Internet connection not working" => "اتصال اینترنت کار نمی کند",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید.",
 "Cron" => "زمانبند",
 "Execute one task with each page loaded" => "اجرای یک وظیفه با هر بار بارگذاری صفحه",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php در یک سرویس webcron ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
+"Use systems cron service to call the cron.php file every 15 minutes." => "از سرویس کرون سرور استفاده شده است که فایل cron.php را هر 15 دقیقه یک بار فراخوانی کند.",
 "Sharing" => "اشتراک گذاری",
 "Enable Share API" => "فعال کردن API اشتراک گذاری",
 "Allow apps to use the Share API" => "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
 "Allow links" => "اجازه ی لینک ها",
 "Allow users to share items to the public with links" => "اجازه دادن به کاربران برای اشتراک گذاری آیتم ها با عموم از طریق پیوند ها",
+"Allow public uploads" => "اجازه بارگذاری عمومی",
+"Allow users to enable others to upload into their publicly shared folders" => "به کاربران اجازه داده شود که امکان بارگذاری در پوشه هایی که بصورت عمومی به اشتراک گذاشته اند را برای سایرین فعال سازند",
 "Allow resharing" => "مجوز اشتراک گذاری مجدد",
 "Allow users to share items shared with them again" => "اجازه به کاربران برای اشتراک گذاری دوباره با آنها",
 "Allow users to share with anyone" => "اجازه به کابران برای اشتراک گذاری با همه",
 "Allow users to only share with users in their groups" => "اجازه به کاربران برای اشتراک گذاری ، تنها با دیگر کابران گروه خودشان",
+"Allow mail notification" => "مجاز نمودن اطلاع رسانی توسط ایمیل",
+"Allow user to send mail notification for shared files" => "مجاز نمودن ارسال ایمیل توسط کاربر برای فایل‌های به اشتراک گذاشته شده",
 "Security" => "امنیت",
 "Enforce HTTPS" => "وادار کردن HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "برای فعال سازی یا عدم فعال سازی اجبار استفاده از SSL، لطفاً از طریق HTTPS به %s وصل شوید.",
+"Server address" => "آدرس سرور",
+"Port" => "درگاه",
+"Credentials" => "اعتبارهای",
 "Log" => "کارنامه",
 "Log level" => "سطح ورود",
 "More" => "بیش‌تر",
@@ -66,7 +95,6 @@ $TRANSLATIONS = array(
 "Select an App" => "یک برنامه انتخاب کنید",
 "See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-مجاز از طرف <span class=\"author\"></span>",
-"User Documentation" => "مستندات کاربر",
 "Administrator Documentation" => "مستندات مدیر",
 "Online Documentation" => "مستندات آنلاین",
 "Forum" => "انجمن",
@@ -81,14 +109,22 @@ $TRANSLATIONS = array(
 "Current password" => "گذرواژه کنونی",
 "New password" => "گذرواژه جدید",
 "Change password" => "تغییر گذر واژه",
+"Full Name" => "نام کامل",
 "Email" => "ایمیل",
 "Your email address" => "پست الکترونیکی شما",
-"Fill in an email address to enable password recovery" => "پست الکترونیکی را پرکنید  تا بازیابی گذرواژه فعال شود",
 "Profile picture" => "تصویر پروفایل",
+"Upload new" => "بارگذاری جدید",
+"Select new from Files" => "انتخاب جدید از میان فایل ها",
+"Remove image" => "تصویر پاک شود",
+"Either png or jpg. Ideally square but you will be able to crop it." => "هردوی jpg و png ها مربع گونه می‌باشند. با این حال شما می‌توانید آنها را برش بزنید.",
+"Cancel" => "منصرف شدن",
+"Choose as profile image" => "یک تصویر پروفایل انتخاب کنید",
 "Language" => "زبان",
 "Help translate" => "به ترجمه آن کمک کنید",
 "WebDAV" => "WebDAV",
-"Encryption" => "رمزگذاری",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "از این آدرس استفاده کنید تا <a href=\"%s\" target=\"_blank\">بتوانید به فایل‌های خود توسط WebDAV دسترسی پیدا کنید</a>",
+"Log-in password" => "رمز ورود",
+"Decrypt all Files" => "تمام فایلها رمزگشایی شود",
 "Login Name" => "نام کاربری",
 "Create" => "ایجاد کردن",
 "Admin Recovery Password" => "مدیریت بازیابی رمز عبور",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 0451703cc7..7bef4092a4 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Virheellinen arvo kohdassa %s",
+"Saved" => "Tallennettu",
+"test email settings" => "testaa sähköpostiasetukset",
+"If you received this email, the settings seem to be correct." => "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset.",
+"Email sent" => "Sähköposti lähetetty",
+"You need to set your user email before being able to send test emails." => "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta.",
+"Send mode" => "Lähetystila",
+"Encryption" => "Salaus",
+"Authentication method" => "Tunnistautumistapa",
 "Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
 "Authentication error" => "Tunnistautumisvirhe",
 "Your full name has been changed." => "Koko nimesi on muutettu.",
@@ -18,6 +28,9 @@ $TRANSLATIONS = array(
 "Couldn't update app." => "Sovelluksen päivitys epäonnistui.",
 "Wrong password" => "Väärä salasana",
 "Unable to change password" => "Salasanan vaihto ei onnistunut",
+"Sending..." => "Lähetetään...",
+"User Documentation" => "Käyttäjäohjeistus",
+"Admin Documentation" => "Ylläpitäjän ohjeistus",
 "Update to {appversion}" => "Päivitä versioon {appversion}",
 "Disable" => "Poista käytöstä",
 "Enable" => "Käytä",
@@ -30,8 +43,12 @@ $TRANSLATIONS = array(
 "Update" => "Päivitä",
 "Updated" => "Päivitetty",
 "Select a profile picture" => "Valitse profiilikuva",
+"Very weak password" => "Erittäin heikko salasana",
+"Weak password" => "Heikko salasana",
+"So-so password" => "Kohtalainen salasana",
+"Good password" => "Hyvä salasana",
+"Strong password" => "Vahva salasana",
 "Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
-"Saving..." => "Tallennetaan...",
 "deleted" => "poistettu",
 "undo" => "kumoa",
 "Unable to remove user" => "Käyttäjän poistaminen ei onnistunut",
@@ -49,6 +66,10 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Varoitukset, virheet ja vakavat ongelmat",
 "Errors and fatal issues" => "Virheet ja vakavat ongelmat",
 "Fatal issues only" => "Vain vakavat ongelmat",
+"None" => "Ei mitään",
+"Login" => "Kirjaudu",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Turvallisuusvaroitus",
 "Setup Warning" => "Asetusvaroitus",
 "Please double check the <a href=\"%s\">installation guides</a>." => "Lue <a href=\"%s\">asennusohjeet</a> tarkasti.",
@@ -59,8 +80,12 @@ $TRANSLATIONS = array(
 "Locale not working" => "Maa-asetus ei toimi",
 "System locale can not be set to a one which supports UTF-8." => "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.",
 "This means that there might be problems with certain characters in file names." => "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s.",
 "Internet connection not working" => "Internet-yhteys ei toimi",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Viimeisin cron suoritettiin %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
+"Cron was not executed yet!" => "Cronia ei suoritettu vielä!",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumiseen 15 minuutin välein",
 "Sharing" => "Jakaminen",
 "Enable Share API" => "Käytä jakamisen ohjelmointirajapintaa",
@@ -77,6 +102,17 @@ $TRANSLATIONS = array(
 "Security" => "Tietoturva",
 "Enforce HTTPS" => "Pakota HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
+"Email Server" => "Sähköpostipalvelin",
+"This is used for sending out notifications." => "Tätä käytetään ilmoitusten lähettämiseen.",
+"From address" => "Lähettäjän osoite",
+"Authentication required" => "Tunnistautuminen vaaditaan",
+"Server address" => "Palvelimen osoite",
+"Port" => "Portti",
+"Credentials" => "Tilitiedot",
+"SMTP Username" => "SMTP-käyttäjätunnus",
+"SMTP Password" => "SMTP-salasana",
+"Test email settings" => "Testaa sähköpostiasetukset",
+"Send email" => "Lähetä sähköpostiviesti",
 "Log" => "Loki",
 "Log level" => "Lokitaso",
 "More" => "Enemmän",
@@ -86,9 +122,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Lisää sovelluksesi",
 "More Apps" => "Lisää sovelluksia",
 "Select an App" => "Valitse sovellus",
+"Documentation:" => "Ohjeistus:",
 "See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
+"See application website" => "Lue lisää sovelluksen sivustolta",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>",
-"User Documentation" => "Käyttäjäohjeistus",
 "Administrator Documentation" => "Ylläpito-ohjeistus",
 "Online Documentation" => "Verkko-ohjeistus",
 "Forum" => "Keskustelupalsta",
@@ -106,24 +143,24 @@ $TRANSLATIONS = array(
 "Full Name" => "Koko nimi",
 "Email" => "Sähköpostiosoite",
 "Your email address" => "Sähköpostiosoitteesi",
-"Fill in an email address to enable password recovery" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa",
+"Fill in an email address to enable password recovery and receive notifications" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa ja voit vastaanottaa ilmoituksia",
 "Profile picture" => "Profiilikuva",
 "Upload new" => "Lähetä uusi",
 "Select new from Files" => "Valitse uusi tiedostoista",
 "Remove image" => "Poista kuva",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Joko png- tai jpg-kuva. Mieluite neliö, voit kuitenkin rajata kuvaa.",
-"Abort" => "Keskeytä",
+"Cancel" => "Peru",
 "Choose as profile image" => "Valitse profiilikuvaksi",
 "Language" => "Kieli",
 "Help translate" => "Auta kääntämisessä",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Käytä tätä osoitetta <a href=\"%s\" target=\"_blank\">käyttääksesi tiedostojasi WebDAVin kautta</a>",
-"Encryption" => "Salaus",
 "The encryption app is no longer enabled, please decrypt all your files" => "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
 "Decrypt all Files" => "Pura kaikkien tiedostojen salaus",
 "Login Name" => "Kirjautumisnimi",
 "Create" => "Luo",
 "Default Storage" => "Oletustallennustila",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Määritä tallennustilan kiintiö (esim. \"512 MB\" tai \"12 GB\")",
 "Unlimited" => "Rajoittamaton",
 "Other" => "Muu",
 "Username" => "Käyttäjätunnus",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 156533f6fa..11c75ea1e0 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Type de valeur METADATA invalide : \"%s\".",
+"Saved" => "Sauvegarder",
+"test email settings" => "tester les paramètres d'e-mail",
+"If you received this email, the settings seem to be correct." => "Si vous recevez cet email, c'est que les paramètres sont corrects",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres.",
+"Email sent" => "Email envoyé",
+"You need to set your user email before being able to send test emails." => "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test.",
+"Send mode" => "Mode d'envoi",
+"Encryption" => "Chiffrement",
+"Authentication method" => "Méthode d'authentification",
 "Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
 "Authentication error" => "Erreur d'authentification",
 "Your full name has been changed." => "Votre nom complet a été modifié.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
 "Unable to change password" => "Impossible de modifier le mot de passe",
+"Sending..." => "Envoi en cours...",
+"User Documentation" => "Documentation utilisateur",
+"Admin Documentation" => "Documentation administrateur",
 "Update to {appversion}" => "Mettre à jour vers {appversion}",
 "Disable" => "Désactiver",
 "Enable" => "Activer",
@@ -34,13 +47,17 @@ $TRANSLATIONS = array(
 "Update" => "Mettre à jour",
 "Updated" => "Mise à jour effectuée avec succès",
 "Select a profile picture" => "Selectionner une photo de profil ",
+"Very weak password" => "Mot de passe de très faible sécurité",
+"Weak password" => "Mot de passe de faible sécurité",
+"So-so password" => "Mot de passe de sécurité tout juste acceptable",
+"Good password" => "Mot de passe de sécurité suffisante",
+"Strong password" => "Mot de passe de forte sécurité",
 "Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
-"Saving..." => "Enregistrement...",
 "deleted" => "supprimé",
 "undo" => "annuler",
 "Unable to remove user" => "Impossible de retirer l'utilisateur",
 "Groups" => "Groupes",
-"Group Admin" => "Groupe Admin",
+"Group Admin" => "Admin Groupe",
 "Delete" => "Supprimer",
 "add group" => "ajouter un groupe",
 "A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avertissements, erreurs et erreurs fatales",
 "Errors and fatal issues" => "Erreurs et erreurs fatales",
 "Fatal issues only" => "Erreurs fatales uniquement",
+"None" => "Aucun",
+"Login" => "Connexion",
+"Plain" => "En clair",
+"NT LAN Manager" => "Gestionnaire du réseau NT",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Avertissement de sécurité",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Vous accédez à %s via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS à la place.",
 "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." => "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.",
@@ -90,6 +113,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forcer HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
+"Email Server" => "Serveur mail",
+"This is used for sending out notifications." => "Ceci est utilisé pour l'envoi des notifications.",
+"From address" => "Adresse source",
+"Authentication required" => "Authentification requise",
+"Server address" => "Adresse du serveur",
+"Port" => "Port",
+"Credentials" => "Informations d'identification",
+"SMTP Username" => "Nom d'utilisateur SMTP",
+"SMTP Password" => "Mot de passe SMTP",
+"Test email settings" => "Paramètres de test d'e-mail",
+"Send email" => "Envoyer un e-mail",
 "Log" => "Log",
 "Log level" => "Niveau de log",
 "More" => "Plus",
@@ -99,9 +133,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Ajoutez votre application",
 "More Apps" => "Plus d'applications…",
 "Select an App" => "Sélectionner une Application",
+"Documentation:" => "Documentation :",
 "See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com",
+"See application website" => "Voir le site web de l'application",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
-"User Documentation" => "Documentation utilisateur",
 "Administrator Documentation" => "Documentation administrateur",
 "Online Documentation" => "Documentation en ligne",
 "Forum" => "Forum",
@@ -119,33 +154,32 @@ $TRANSLATIONS = array(
 "Full Name" => "Nom complet",
 "Email" => "Adresse mail",
 "Your email address" => "Votre adresse e-mail",
-"Fill in an email address to enable password recovery" => "Entrez votre adresse e-mail pour permettre la réinitialisation du mot de passe",
+"Fill in an email address to enable password recovery and receive notifications" => "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
 "Profile picture" => "Photo de profil",
 "Upload new" => "Télécharger nouveau",
 "Select new from Files" => "Sélectionner un nouveau depuis les documents",
 "Remove image" => "Supprimer l'image",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Soit png ou jpg. idéalement carée mais vous pourrez la recadrer .",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer.",
 "Your avatar is provided by your original account." => "Votre avatar est fourni par votre compte original.",
-"Abort" => "Abandonner",
+"Cancel" => "Annuler",
 "Choose as profile image" => "Choisir en temps que photo de profil ",
 "Language" => "Langue",
 "Help translate" => "Aidez à traduire",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utiliser cette adresse pour <a href=\"%s\" target=\"_blank\"> accéder à vos fichiers par WebDAV</a>",
-"Encryption" => "Chiffrement",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
 "Log-in password" => "Mot de passe de connexion",
 "Decrypt all Files" => "Déchiffrer tous les fichiers",
-"Login Name" => "Nom de la connexion",
+"Login Name" => "Nom d'utilisateur",
 "Create" => "Créer",
 "Admin Recovery Password" => "Récupération du mot de passe administrateur",
 "Enter the recovery password in order to recover the users files during password change" => "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
-"Default Storage" => "Support de stockage par défaut",
+"Default Storage" => "Espace de stockage par défaut",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Veuillez entrer le quota de stockage (ex. \"512 MB\" ou \"12 GB\")",
 "Unlimited" => "Illimité",
 "Other" => "Autre",
 "Username" => "Nom d'utilisateur",
-"Storage" => "Support de stockage",
+"Storage" => "Espace de stockage",
 "change full name" => "Modifier le nom complet",
 "set new password" => "Changer le mot de passe",
 "Default" => "Défaut"
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index e345280bdd..2d23efd96a 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Forneceu un valor incorrecto para %s",
+"Saved" => "Gardado",
+"test email settings" => "correo de proba dos axustes",
+"If you received this email, the settings seem to be correct." => "Se recibiu este correo, semella que a configuración é correcta.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Produciuse un problema ao enviar o correo. Revise os seus axustes.",
+"Email sent" => "Correo enviado",
+"You need to set your user email before being able to send test emails." => "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
+"Send mode" => "Modo de envío",
+"Encryption" => "Cifrado",
+"Authentication method" => "Método de autenticación",
 "Unable to load list from App Store" => "Non foi posíbel cargar a lista desde a App Store",
 "Authentication error" => "Produciuse un erro de autenticación",
 "Your full name has been changed." => "O seu nome completo foi cambiado",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
 "Unable to change password" => "Non é posíbel cambiar o contrasinal",
+"Sending..." => "Enviando...",
+"User Documentation" => "Documentación do usuario",
+"Admin Documentation" => "Documentación do administrador",
 "Update to {appversion}" => "Actualizar á {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccione unha imaxe para o perfil",
+"Very weak password" => "Contrasinal moi feble",
+"Weak password" => "Contrasinal feble",
+"So-so password" => "Contrasinal non moi aló",
+"Good password" => "Bo contrasinal",
+"Strong password" => "Contrasinal forte",
 "Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
-"Saving..." => "Gardando...",
 "deleted" => "eliminado",
 "undo" => "desfacer",
 "Unable to remove user" => "Non é posíbel retirar o usuario",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avisos, erros e problemas críticos",
 "Errors and fatal issues" => "Erros e problemas críticos",
 "Fatal issues only" => "Só problemas críticos",
+"None" => "Ningún",
+"Login" => "Acceso",
+"Plain" => "Simple",
+"NT LAN Manager" => "Xestor NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Aviso de seguranza",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está accedendo a %s a través de HTTP. Suxerímoslle que configure o seu servidor para requirir, no seu canto, o uso de 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." => "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través de internet. O ficheiro .htaccess non está a traballar. Suxerímoslle que configure o seu servidor web de tal maneira que o cartafol de datos non estea accesíbel ou que mova o o directorio de datos fóra da raíz de documentos do servidor web.",
@@ -70,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "A conexión á Internet non funciona",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicativos de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "O último «cron» executouse ás %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
+"Cron was not executed yet!" => "«Cron» aínda non foi executado!",
 "Execute one task with each page loaded" => "Executar unha tarefa con cada páxina cargada",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Use o servizo de sistema cron para chamar ao ficheiro cron.php cada 15 minutos.",
@@ -90,6 +116,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL.",
+"Email Server" => "Servidor de correo",
+"This is used for sending out notifications." => "Isto utilizase para o envío de notificacións.",
+"From address" => "Desde o enderezo",
+"Authentication required" => "Requírese autenticación",
+"Server address" => "Enderezo do servidor",
+"Port" => "Porto",
+"Credentials" => "Credenciais",
+"SMTP Username" => "Nome de usuario SMTP",
+"SMTP Password" => "Contrasinal SMTP",
+"Test email settings" => "Correo de proba dos axustes",
+"Send email" => "Enviar o correo",
 "Log" => "Rexistro",
 "Log level" => "Nivel de rexistro",
 "More" => "Máis",
@@ -99,9 +136,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Engada o seu aplicativo",
 "More Apps" => "Máis aplicativos",
 "Select an App" => "Escolla un aplicativo",
+"Documentation:" => "Documentación:",
 "See application page at apps.owncloud.com" => "Consulte a páxina do aplicativo en apps.owncloud.com",
+"See application website" => "Vexa o sitio web do aplicativo",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>",
-"User Documentation" => "Documentación do usuario",
 "Administrator Documentation" => "Documentación do administrador",
 "Online Documentation" => "Documentación na Rede",
 "Forum" => "Foro",
@@ -119,20 +157,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Nome completo",
 "Email" => "Correo",
 "Your email address" => "O seu enderezo de correo",
-"Fill in an email address to enable password recovery" => "Escriba un enderezo de correo para activar o contrasinal de recuperación",
+"Fill in an email address to enable password recovery and receive notifications" => "Escriba un enderezo de correo para permitir a recuperación de contrasinais e recibir notificacións",
 "Profile picture" => "Imaxe do perfil",
 "Upload new" => "Novo envío",
 "Select new from Files" => "Seleccione unha nova de ficheiros",
 "Remove image" => "Retirar a imaxe",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Calquera png ou jpg. É preferíbel que sexa cadrada, mais poderá recortala.",
 "Your avatar is provided by your original account." => "O seu avatar é fornecido pola súa conta orixinal.",
-"Abort" => "Cancelar",
+"Cancel" => "Cancelar",
 "Choose as profile image" => "Escolla unha imaxe para o perfil",
 "Language" => "Idioma",
 "Help translate" => "Axude na tradución",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Empregue esta ligazón  <a href=\"%s\" target=\"_blank\">para acceder aos sus ficheiros mediante WebDAV</a>",
-"Encryption" => "Cifrado",
 "The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de cifrado non está activado, descifre todos os ficheiros",
 "Log-in password" => "Contrasinal de acceso",
 "Decrypt all Files" => "Descifrar todos os ficheiros",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 21c32d0f8e..0b42c2167a 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "הודעת הדוא״ל נשלחה",
+"Encryption" => "הצפנה",
 "Unable to load list from App Store" => "לא ניתן לטעון רשימה מה־App Store",
 "Authentication error" => "שגיאת הזדהות",
 "Group already exists" => "הקבוצה כבר קיימת",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "לא ניתן להוסיף משתמש לקבוצה %s",
 "Unable to remove user from group %s" => "לא ניתן להסיר משתמש מהקבוצה %s",
 "Couldn't update app." => "לא ניתן לעדכן את היישום.",
+"User Documentation" => "תיעוד משתמש",
 "Update to {appversion}" => "עדכון לגרסה {appversion}",
 "Disable" => "בטל",
 "Enable" => "הפעלה",
@@ -23,7 +26,6 @@ $TRANSLATIONS = array(
 "Error" => "שגיאה",
 "Update" => "עדכון",
 "Updated" => "מעודכן",
-"Saving..." => "שמירה…",
 "deleted" => "נמחק",
 "undo" => "ביטול",
 "Unable to remove user" => "לא ניתן להסיר את המשתמש",
@@ -35,6 +37,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "יצירת המשתמש נכשלה",
 "A valid password must be provided" => "יש לספק ססמה תקנית",
 "__language_name__" => "עברית",
+"None" => "כלום",
+"Login" => "התחברות",
 "Security Warning" => "אזהרת אבטחה",
 "Setup Warning" => "שגיאת הגדרה",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
@@ -53,6 +57,9 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "לאפשר למשתמשים לשתף עם משתמשים בקבוצות שלהם בלבד",
 "Security" => "אבטחה",
 "Enforce HTTPS" => "לאלץ HTTPS",
+"Server address" => "כתובת שרת",
+"Port" => "פורט",
+"Credentials" => "פרטי גישה",
 "Log" => "יומן",
 "Log level" => "רמת הדיווח",
 "More" => "יותר",
@@ -64,7 +71,6 @@ $TRANSLATIONS = array(
 "Select an App" => "בחירת יישום",
 "See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>",
-"User Documentation" => "תיעוד משתמש",
 "Administrator Documentation" => "תיעוד מנהלים",
 "Online Documentation" => "תיעוד מקוון",
 "Forum" => "פורום",
@@ -81,12 +87,11 @@ $TRANSLATIONS = array(
 "Change password" => "שינוי ססמה",
 "Email" => "דואר אלקטרוני",
 "Your email address" => "כתובת הדוא״ל שלך",
-"Fill in an email address to enable password recovery" => "נא למלא את כתובת הדוא״ל שלך כדי לאפשר שחזור ססמה",
 "Profile picture" => "תמונת פרופיל",
+"Cancel" => "ביטול",
 "Language" => "פה",
 "Help translate" => "עזרה בתרגום",
 "WebDAV" => "WebDAV",
-"Encryption" => "הצפנה",
 "Login Name" => "שם כניסה",
 "Create" => "יצירה",
 "Admin Recovery Password" => "ססמת השחזור של המנהל",
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index 2c65a26dae..67463ef7bd 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -1,11 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "ईमेल भेज दिया गया है ",
 "Error" => "त्रुटि",
 "Update" => "अद्यतन",
 "Security Warning" => "सुरक्षा चेतावनी ",
 "Password" => "पासवर्ड",
 "New password" => "नया पासवर्ड",
-"Abort" => "रद्द करना ",
 "Username" => "प्रयोक्ता का नाम"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 4a225ed4b8..d0b19c3c3c 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -9,13 +9,13 @@ $TRANSLATIONS = array(
 "Disable" => "Isključi",
 "Enable" => "Uključi",
 "Error" => "Greška",
-"Saving..." => "Spremanje...",
 "deleted" => "izbrisano",
 "undo" => "vrati",
 "Groups" => "Grupe",
 "Group Admin" => "Grupa Admin",
 "Delete" => "Obriši",
 "__language_name__" => "__ime_jezika__",
+"Login" => "Prijava",
 "Cron" => "Cron",
 "Log" => "dnevnik",
 "More" => "više",
@@ -29,9 +29,10 @@ $TRANSLATIONS = array(
 "Change password" => "Izmjena lozinke",
 "Email" => "e-mail adresa",
 "Your email address" => "Vaša e-mail adresa",
-"Fill in an email address to enable password recovery" => "Ispunite vase e-mail adresa kako bi se omogućilo oporavak lozinke",
+"Cancel" => "Odustani",
 "Language" => "Jezik",
 "Help translate" => "Pomoć prevesti",
+"Login Name" => "Prijava",
 "Create" => "Izradi",
 "Other" => "ostali",
 "Username" => "Korisničko ime"
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 6b2dc3e017..b3492b9fd7 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Az emailt elküldtük",
+"Encryption" => "Titkosítás",
 "Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
 "Authentication error" => "Azonosítási hiba",
 "Your full name has been changed." => "Az Ön teljes nevét módosítottuk.",
@@ -22,6 +24,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Hibás admin helyreállítási jelszó. Ellenörizd a jelszót és próbáld újra.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "A back-end nem támogatja a jelszó módosítást, de felhasználó titkosítási kulcsa sikeresen frissítve lett.",
 "Unable to change password" => "Nem sikerült megváltoztatni a jelszót",
+"User Documentation" => "Felhasználói leírás",
 "Update to {appversion}" => "Frissítés erre a verzióra: {appversion}",
 "Disable" => "Letiltás",
 "Enable" => "engedélyezve",
@@ -35,7 +38,6 @@ $TRANSLATIONS = array(
 "Updated" => "Frissítve",
 "Select a profile picture" => "Válassz profil képet",
 "Decrypting files... Please wait, this can take some time." => "File-ok kititkosítása folyamatban... Kérlek várj, ez hosszabb ideig is eltarthat ...",
-"Saving..." => "Mentés...",
 "deleted" => "törölve",
 "undo" => "visszavonás",
 "Unable to remove user" => "A felhasználót nem sikerült eltávolítáni",
@@ -53,6 +55,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Figyelmeztetések, hibák és végzetes hibák",
 "Errors and fatal issues" => "Hibák és végzetes hibák",
 "Fatal issues only" => "Csak a végzetes hibák",
+"None" => "Egyik sem",
+"Login" => "Bejelentkezés",
 "Security Warning" => "Biztonsági figyelmeztetés",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Jelenlegi elérése a következőnek '%s' jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálot úgy állitsd be, hogy HTTPS-t tudjál használni.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon erősen ajánlott, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
@@ -90,6 +94,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Kötelező HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Kérjük kapcsolodjon a %s rendszerhez HTTPS protokollon keresztül, hogy be vagy ki kapcsoljaa kötelező SSL beállítást.",
+"Server address" => "A kiszolgáló címe",
+"Port" => "Port",
+"Credentials" => "Azonosítók",
 "Log" => "Naplózás",
 "Log level" => "Naplózási szint",
 "More" => "Több",
@@ -101,7 +108,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Válasszon egy alkalmazást",
 "See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>",
-"User Documentation" => "Felhasználói leírás",
 "Administrator Documentation" => "Üzemeltetői leírás",
 "Online Documentation" => "Online leírás",
 "Forum" => "Fórum",
@@ -119,20 +125,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Teljes név",
 "Email" => "Email",
 "Your email address" => "Az Ön email címe",
-"Fill in an email address to enable password recovery" => "Adja meg az email címét, hogy jelszó-emlékeztetőt kérhessen, ha elfelejtette a jelszavát!",
 "Profile picture" => "Profilkép",
 "Upload new" => "Új feltöltése",
 "Select new from Files" => "Új kiválasztása Fileokból",
 "Remove image" => "Kép eltávolítása",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Egyaránt png vagy jpg. Az ideális ha négyzet alaku, de késöbb még átszabható",
 "Your avatar is provided by your original account." => "Az avatarod az eredeti fiókod alapján van beállítva.",
-"Abort" => "Megszakítás",
+"Cancel" => "Mégsem",
 "Choose as profile image" => "Válassz profil képet",
 "Language" => "Nyelv",
 "Help translate" => "Segítsen a fordításban!",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Ezt a címet használd, hogy <a href=\"%s\" target=\"_blank\">hozzáférj a fileokhoz WebDAV-on keresztül</a>",
-"Encryption" => "Titkosítás",
 "The encryption app is no longer enabled, please decrypt all your files" => "A titkosító alkalmazás továbbiakban nem lesz engedélyezve, szüntesd meg a titkosítását a file-jaidnak.",
 "Log-in password" => "Bejelentkezési jelszó",
 "Decrypt all Files" => "Kititkosítja az összes file-t",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index b51bc32a2f..35ddeb30ca 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -20,6 +20,7 @@ $TRANSLATIONS = array(
 "Email" => "E-posta",
 "Your email address" => "Tu adresse de e-posta",
 "Profile picture" => "Imagine de profilo",
+"Cancel" => "Cancellar",
 "Language" => "Linguage",
 "Help translate" => "Adjuta a traducer",
 "Create" => "Crear",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 2ff3f57296..a7b59d82f8 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email terkirim",
+"Encryption" => "Enkripsi",
 "Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
 "Authentication error" => "Galat saat autentikasi",
 "Your full name has been changed." => "Nama lengkap Anda telah diubah",
@@ -21,6 +23,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.",
 "Unable to change password" => "Tidak dapat mengubah sandi",
+"User Documentation" => "Dokumentasi Pengguna",
 "Update to {appversion}" => "Perbarui ke {appversion}",
 "Disable" => "Nonaktifkan",
 "Enable" => "Aktifkan",
@@ -34,7 +37,6 @@ $TRANSLATIONS = array(
 "Updated" => "Diperbarui",
 "Select a profile picture" => "Pilih foto profil",
 "Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat.",
-"Saving..." => "Menyimpan...",
 "deleted" => "dihapus",
 "undo" => "urungkan",
 "Unable to remove user" => "Tidak dapat menghapus pengguna",
@@ -52,6 +54,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Peringatan, galat dan masalah fatal",
 "Errors and fatal issues" => "Galat dan masalah fatal",
 "Fatal issues only" => "Hanya masalah fatal",
+"None" => "Tidak ada",
+"Login" => "Masuk",
 "Security Warning" => "Peringatan Keamanan",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Anda mengakses %s melalui HTTP. Kami sangat menyarankan Anda untuk mengkonfigurasi server dengan menggunakan HTTPS sebagai gantinya.",
 "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." => "Direktori data dan berkas Anda mungkin dapat diakses dari internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan untuk mengkonfigurasi server web Anda agar direktori data tidak lagi dapat diakses atau Anda dapat memindahkan direktori data di luar dokumen root webserver.",
@@ -88,6 +92,8 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Selalu Gunakan HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
+"Server address" => "Alamat server",
+"Port" => "port",
 "Log" => "Catat",
 "Log level" => "Level pencatatan",
 "More" => "Lainnya",
@@ -99,7 +105,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Pilih Aplikasi",
 "See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>",
-"User Documentation" => "Dokumentasi Pengguna",
 "Administrator Documentation" => "Dokumentasi Administrator",
 "Online Documentation" => "Dokumentasi Online",
 "Forum" => "Forum",
@@ -117,20 +122,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Nama Lengkap",
 "Email" => "Email",
 "Your email address" => "Alamat email Anda",
-"Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan sandi",
 "Profile picture" => "Foto profil",
 "Upload new" => "Unggah baru",
 "Select new from Files" => "Pilih baru dari Berkas",
 "Remove image" => "Hapus gambar",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Bisa png atau jpg. Idealnya berbentuk persegi tetapi jika tidak Anda bisa memotongnya nanti.",
 "Your avatar is provided by your original account." => "Avatar disediakan oleh akun asli Anda.",
-"Abort" => "Batal",
+"Cancel" => "Batal",
 "Choose as profile image" => "Pilih sebagai gambar profil",
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gunakan alamat ini untuk <a href=\"%s\" target=\"_blank\">mengakses Berkas via WebDAV</a>",
-"Encryption" => "Enkripsi",
 "The encryption app is no longer enabled, please decrypt all your files" => "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
 "Log-in password" => "Sandi masuk",
 "Decrypt all Files" => "Deskripsi semua Berkas",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 6798783f83..3f8b5accda 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Tölvupóstur sendur",
+"Encryption" => "Dulkóðun",
 "Unable to load list from App Store" => "Ekki tókst að hlaða lista frá forrita síðu",
 "Authentication error" => "Villa við auðkenningu",
 "Group already exists" => "Hópur er þegar til",
@@ -13,6 +15,7 @@ $TRANSLATIONS = array(
 "Admins can't remove themself from the admin group" => "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp",
 "Unable to add user to group %s" => "Ekki tókst að bæta notenda við hópinn %s",
 "Unable to remove user from group %s" => "Ekki tókst að fjarlægja notanda úr hópnum %s",
+"User Documentation" => "Notenda handbók",
 "Disable" => "Gera óvirkt",
 "Enable" => "Virkja",
 "Please wait...." => "Andartak....",
@@ -20,14 +23,15 @@ $TRANSLATIONS = array(
 "Error" => "Villa",
 "Update" => "Uppfæra",
 "Updated" => "Uppfært",
-"Saving..." => "Er að vista ...",
 "deleted" => "eytt",
 "undo" => "afturkalla",
 "Groups" => "Hópar",
 "Group Admin" => "Hópstjóri",
 "Delete" => "Eyða",
 "__language_name__" => "__nafn_tungumáls__",
+"None" => "Ekkert",
 "Security Warning" => "Öryggis aðvörun",
+"Server address" => "Host nafn netþjóns",
 "More" => "Meira",
 "Less" => "Minna",
 "Version" => "Útgáfa",
@@ -37,7 +41,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Veldu forrit",
 "See application page at apps.owncloud.com" => "Skoða síðu forrits hjá apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-leyfi skráð af <span class=\"author\"></span>",
-"User Documentation" => "Notenda handbók",
 "Administrator Documentation" => "Stjórnenda handbók",
 "Online Documentation" => "Handbók á netinu",
 "Forum" => "Vefspjall",
@@ -52,11 +55,10 @@ $TRANSLATIONS = array(
 "Change password" => "Breyta lykilorði",
 "Email" => "Netfang",
 "Your email address" => "Netfangið þitt",
-"Fill in an email address to enable password recovery" => "Sláðu inn netfangið þitt til að virkja endurheimt á lykilorði",
+"Cancel" => "Hætta við",
 "Language" => "Tungumál",
 "Help translate" => "Hjálpa við þýðingu",
 "WebDAV" => "WebDAV",
-"Encryption" => "Dulkóðun",
 "Create" => "Búa til",
 "Default Storage" => "Sjálfgefin gagnageymsla",
 "Unlimited" => "Ótakmarkað",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 08bab35244..10151a0a1e 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Valore non valido fornito per %s",
+"Saved" => "Salvato",
+"test email settings" => "prova impostazioni email",
+"If you received this email, the settings seem to be correct." => "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.",
+"Email sent" => "Email inviata",
+"You need to set your user email before being able to send test emails." => "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.",
+"Send mode" => "Modalità di invio",
+"Encryption" => "Cifratura",
+"Authentication method" => "Metodo di autenticazione",
 "Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
 "Authentication error" => "Errore di autenticazione",
 "Your full name has been changed." => "Il tuo nome completo è stato cambiato.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Password amministrativa di ripristino errata. Controlla la password e prova ancora.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.",
 "Unable to change password" => "Impossibile cambiare la password",
+"Sending..." => "Invio in corso...",
+"User Documentation" => "Documentazione utente",
+"Admin Documentation" => "Documentazione di amministrazione",
 "Update to {appversion}" => "Aggiorna a {appversion}",
 "Disable" => "Disabilita",
 "Enable" => "Abilita",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Aggiorna",
 "Updated" => "Aggiornato",
 "Select a profile picture" => "Seleziona un'immagine del profilo",
+"Very weak password" => "Password molto debole",
+"Weak password" => "Password debole",
+"So-so password" => "Password così-così",
+"Good password" => "Password buona",
+"Strong password" => "Password forte",
 "Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
-"Saving..." => "Salvataggio in corso...",
 "deleted" => "eliminati",
 "undo" => "annulla",
 "Unable to remove user" => "Impossibile rimuovere l'utente",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avvisi, errori e problemi gravi",
 "Errors and fatal issues" => "Errori e problemi gravi",
 "Fatal issues only" => "Solo problemi gravi",
+"None" => "Nessuno",
+"Login" => "Accesso",
+"Plain" => "Semplice",
+"NT LAN Manager" => "Gestore NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Avviso di sicurezza",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Sei connesso a %s tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere l'utilizzo del protocollo HTTPS al posto di HTTP.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o spostare la cartella fuori dalla radice del server web.",
@@ -70,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Concessione Internet non funzionante",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Questo server ownCloud non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "L'ultimo cron è stato eseguito alle %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "L'ultimo cron è stato eseguito alle %s. È più di un ora fa, qualcosa sembra sbagliato.",
+"Cron was not executed yet!" => "Cron non è ancora stato eseguito!",
 "Execute one task with each page loaded" => "Esegui un'operazione con ogni pagina caricata",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
@@ -90,6 +116,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forza HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forza i client a connettersi a %s tramite una connessione cifrata.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
+"Email Server" => "Server di posta",
+"This is used for sending out notifications." => "Viene utilizzato per inviare le notifiche.",
+"From address" => "Indirizzo mittente",
+"Authentication required" => "Autenticazione richiesta",
+"Server address" => "Indirizzo del server",
+"Port" => "Porta",
+"Credentials" => "Credenziali",
+"SMTP Username" => "Nome utente SMTP",
+"SMTP Password" => "Password SMTP",
+"Test email settings" => "Prova impostazioni email",
+"Send email" => "Invia email",
 "Log" => "Log",
 "Log level" => "Livello di log",
 "More" => "Altro",
@@ -99,9 +136,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Aggiungi la tua applicazione",
 "More Apps" => "Altre applicazioni",
 "Select an App" => "Seleziona un'applicazione",
+"Documentation:" => "Documentazione:",
 "See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
+"See application website" => "Visita il sito web dell'applicazione",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>",
-"User Documentation" => "Documentazione utente",
 "Administrator Documentation" => "Documentazione amministratore",
 "Online Documentation" => "Documentazione in linea",
 "Forum" => "Forum",
@@ -119,20 +157,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Nome completo",
 "Email" => "Posta elettronica",
 "Your email address" => "Il tuo indirizzo email",
-"Fill in an email address to enable password recovery" => "Inserisci il tuo indirizzo email per abilitare il recupero della password",
+"Fill in an email address to enable password recovery and receive notifications" => "Inserisci il tuo indirizzo di posta per abilitare il recupero della password e ricevere notifiche",
 "Profile picture" => "Immagine del profilo",
 "Upload new" => "Carica nuova",
 "Select new from Files" => "Seleziona nuova da file",
 "Remove image" => "Rimuovi immagine",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla.",
 "Your avatar is provided by your original account." => "Il tuo avatar è ottenuto dal tuo account originale.",
-"Abort" => "Interrompi",
+"Cancel" => "Annulla",
 "Choose as profile image" => "Scegli come immagine del profilo",
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilizza questo indirizzo per <a href=\"%s\" target=\"_blank\">accedere ai tuoi file con WebDAV</a>",
-"Encryption" => "Cifratura",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
 "Log-in password" => "Password di accesso",
 "Decrypt all Files" => "Decifra tutti i file",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
new file mode 100644
index 0000000000..7a2802d588
--- /dev/null
+++ b/settings/l10n/ja.php
@@ -0,0 +1,187 @@
+<?php
+$TRANSLATIONS = array(
+"Invalid value supplied for %s" => "%s に提供された無効な値",
+"Saved" => "保存されました",
+"test email settings" => "eメール設定をテスト",
+"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "メールの送信中に問題が発生しました。設定を再考してください。",
+"Email sent" => "メールを送信しました",
+"You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
+"Send mode" => "送信モード",
+"Encryption" => "暗号化",
+"Authentication method" => "認証方法",
+"Unable to load list from App Store" => "アプリストアからリストをロードできません",
+"Authentication error" => "認証エラー",
+"Your full name has been changed." => "フルネームを変更しました。",
+"Unable to change full name" => "フルネームを変更できません",
+"Group already exists" => "グループはすでに存在します",
+"Unable to add group" => "グループを追加できません",
+"Email saved" => "メールアドレスを保存しました",
+"Invalid email" => "無効なメールアドレス",
+"Unable to delete group" => "グループを削除できません",
+"Unable to delete user" => "ユーザーを削除できません",
+"Language changed" => "言語が変更されました",
+"Invalid request" => "不正なリクエスト",
+"Admins can't remove themself from the admin group" => "管理者は自身を管理者グループから削除できません。",
+"Unable to add user to group %s" => "ユーザーをグループ %s に追加できません",
+"Unable to remove user from group %s" => "ユーザーをグループ %s から削除できません",
+"Couldn't update app." => "アプリをアップデートできませんでした。",
+"Wrong password" => "無効なパスワード",
+"No user supplied" => "ユーザーが指定されていません",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。",
+"Wrong admin recovery password. Please check the password and try again." => "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
+"Unable to change password" => "パスワードを変更できません",
+"Sending..." => "送信中…",
+"User Documentation" => "ユーザードキュメント",
+"Admin Documentation" => "管理者ドキュメント",
+"Update to {appversion}" => "{appversion} にアップデート",
+"Disable" => "無効",
+"Enable" => "有効にする",
+"Please wait...." => "しばらくお待ちください。",
+"Error while disabling app" => "アプリ無効化中にエラーが発生",
+"Error while enabling app" => "アプリを有効にする際にエラーが発生",
+"Updating...." => "更新中....",
+"Error while updating app" => "アプリの更新中にエラーが発生",
+"Error" => "エラー",
+"Update" => "アップデート",
+"Updated" => "アップデート済み",
+"Select a profile picture" => "プロファイル画像を選択",
+"Very weak password" => "非常に弱いパスワード",
+"Weak password" => "弱いパスワード",
+"So-so password" => "まずまずのパスワード",
+"Good password" => "良好なパスワード",
+"Strong password" => "強いパスワード",
+"Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
+"deleted" => "削除",
+"undo" => "元に戻す",
+"Unable to remove user" => "ユーザーを削除できません",
+"Groups" => "グループ",
+"Group Admin" => "グループ管理者",
+"Delete" => "削除",
+"add group" => "グループを追加",
+"A valid username must be provided" => "有効なユーザー名を指定する必要があります",
+"Error creating user" => "ユーザー作成エラー",
+"A valid password must be provided" => "有効なパスワードを指定する必要があります",
+"Warning: Home directory for user \"{user}\" already exists" => "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
+"__language_name__" => "Japanese (日本語)",
+"Everything (fatal issues, errors, warnings, info, debug)" => "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
+"Info, warnings, errors and fatal issues" => "情報、警告、エラー、致命的な問題",
+"Warnings, errors and fatal issues" => "警告、エラー、致命的な問題",
+"Errors and fatal issues" => "エラー、致命的な問題",
+"Fatal issues only" => "致命的な問題のみ",
+"None" => "なし",
+"Login" => "ログイン",
+"Plain" => "平文",
+"NT LAN Manager" => "NT LAN マネージャー",
+"SSL" => "SSL",
+"TLS" => "TLS",
+"Security Warning" => "セキュリティ警告",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "HTTP経由で %s にアクセスしています。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." => "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにウェブサーバーを設定するか、ウェブサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
+"Setup Warning" => "セットアップ警告",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
+"Please double check the <a href=\"%s\">installation guides</a>." => "<a href=\"%s\">installation guides</a>をもう一度チェックするようにお願いいたします。",
+"Module 'fileinfo' missing" => "モジュール 'fileinfo' が見つかりません",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
+"Your PHP version is outdated" => "PHPバーションが古くなっています。",
+"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." => "PHPバーションが古くなっています。古いバージョンには既知の問題があるため、5.3.8以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
+"Locale not working" => "ロケールが動作していません",
+"System locale can not be set to a one which supports UTF-8." => "システムロケールを UTF-8 をサポートするロケールに設定できません。",
+"This means that there might be problems with certain characters in file names." => "これは、ファイル名の特定の文字に問題があることを意味しています。",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
+"Internet connection not working" => "インターネット接続が動作していません",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "各ページの読み込み時にタスクを実行する",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
+"Use systems cron service to call the cron.php file every 15 minutes." => "システムのcronサービスを利用して15分ごとにcron.phpファイルを実行します。",
+"Sharing" => "共有",
+"Enable Share API" => "共有APIを有効にする",
+"Allow apps to use the Share API" => "アプリからの共有APIの利用を許可する",
+"Allow links" => "リンクを許可する",
+"Allow users to share items to the public with links" => "ユーザーがリンクによりアイテムを公開することを許可する",
+"Allow public uploads" => "パブリックなアップロードを許可",
+"Allow users to enable others to upload into their publicly shared folders" => "公開している共有フォルダーへのアップロードを共有しているメンバーにも許可",
+"Allow resharing" => "再共有を許可する",
+"Allow users to share items shared with them again" => "ユーザーが共有しているアイテムの再共有を許可する",
+"Allow users to share with anyone" => "ユーザーに誰とでも共有することを許可する",
+"Allow users to only share with users in their groups" => "ユーザーにグループ内のユーザーとのみ共有を許可する",
+"Allow mail notification" => "メール通知を許可",
+"Allow user to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザーに許可する",
+"Security" => "セキュリティ",
+"Enforce HTTPS" => "常にHTTPSを使用する",
+"Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
+"Email Server" => "メールサーバー",
+"This is used for sending out notifications." => "これは通知の送信に使われます。",
+"From address" => "アドレスから",
+"Authentication required" => "要求される認証",
+"Server address" => "サーバーアドレス",
+"Port" => "ポート",
+"Credentials" => "資格情報",
+"SMTP Username" => "SMTP ユーザー名",
+"SMTP Password" => "SMTP パスワード",
+"Test email settings" => "メールテスト設定",
+"Send email" => "メールを送信",
+"Log" => "ログ",
+"Log level" => "ログレベル",
+"More" => "もっと見る",
+"Less" => "閉じる",
+"Version" => "バージョン",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。",
+"Add your App" => "アプリを追加",
+"More Apps" => "さらにアプリを表示",
+"Select an App" => "アプリを選択してください",
+"Documentation:" => "ドキュメント:",
+"See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
+"See application website" => "アプリケーションのウェブサイトを見る",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
+"Administrator Documentation" => "管理者ドキュメント",
+"Online Documentation" => "オンラインドキュメント",
+"Forum" => "フォーラム",
+"Bugtracker" => "バグトラッカー",
+"Commercial Support" => "商用サポート",
+"Get the apps to sync your files" => "ファイルを同期するためのアプリを取得",
+"Show First Run Wizard again" => "初回ウィザードを再表示する",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
+"Password" => "パスワード",
+"Your password was changed" => "パスワードを変更しました",
+"Unable to change your password" => "パスワードを変更することができません",
+"Current password" => "Current password",
+"New password" => "新しいパスワードを入力",
+"Change password" => "パスワードを変更",
+"Full Name" => "名前",
+"Email" => "メール",
+"Your email address" => "あなたのメールアドレス",
+"Fill in an email address to enable password recovery and receive notifications" => "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
+"Profile picture" => "プロフィール写真",
+"Upload new" => "新規にアップロード",
+"Select new from Files" => "ファイルから新規に選択",
+"Remove image" => "画像を削除",
+"Either png or jpg. Ideally square but you will be able to crop it." => "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。",
+"Your avatar is provided by your original account." => "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
+"Cancel" => "キャンセル",
+"Choose as profile image" => "プロファイル画像として選択",
+"Language" => "言語",
+"Help translate" => "翻訳に協力する",
+"WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください",
+"The encryption app is no longer enabled, please decrypt all your files" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
+"Log-in password" => "ログインパスワード",
+"Decrypt all Files" => "すべてのファイルを複合する",
+"Login Name" => "ログイン名",
+"Create" => "作成",
+"Admin Recovery Password" => "管理者リカバリパスワード",
+"Enter the recovery password in order to recover the users files during password change" => "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
+"Default Storage" => "デフォルトストレージ",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")",
+"Unlimited" => "無制限",
+"Other" => "その他",
+"Username" => "ユーザー名",
+"Storage" => "ストレージ",
+"change full name" => "フルネームを変更",
+"set new password" => "新しいパスワードを設定",
+"Default" => "デフォルト"
+);
+$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index b151564a18..7a2802d588 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,68 +1,91 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "%s に提供された無効な値",
+"Saved" => "保存されました",
+"test email settings" => "eメール設定をテスト",
+"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "メールの送信中に問題が発生しました。設定を再考してください。",
+"Email sent" => "メールを送信しました",
+"You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
+"Send mode" => "送信モード",
+"Encryption" => "暗号化",
+"Authentication method" => "認証方法",
 "Unable to load list from App Store" => "アプリストアからリストをロードできません",
 "Authentication error" => "認証エラー",
-"Your full name has been changed." => "姓名が変更されました",
-"Unable to change full name" => "姓名を変更できません",
-"Group already exists" => "グループは既に存在しています",
+"Your full name has been changed." => "フルネームを変更しました。",
+"Unable to change full name" => "フルネームを変更できません",
+"Group already exists" => "グループはすでに存在します",
 "Unable to add group" => "グループを追加できません",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
 "Unable to delete group" => "グループを削除できません",
-"Unable to delete user" => "ユーザを削除できません",
+"Unable to delete user" => "ユーザーを削除できません",
 "Language changed" => "言語が変更されました",
 "Invalid request" => "不正なリクエスト",
 "Admins can't remove themself from the admin group" => "管理者は自身を管理者グループから削除できません。",
-"Unable to add user to group %s" => "ユーザをグループ %s に追加できません",
-"Unable to remove user from group %s" => "ユーザをグループ %s から削除できません",
-"Couldn't update app." => "アプリを更新出来ませんでした。",
+"Unable to add user to group %s" => "ユーザーをグループ %s に追加できません",
+"Unable to remove user from group %s" => "ユーザーをグループ %s から削除できません",
+"Couldn't update app." => "アプリをアップデートできませんでした。",
 "Wrong password" => "無効なパスワード",
-"No user supplied" => "ユーザが指定されていません",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "復元用の管理者パスワードを入力してください。そうでない場合は、全ユーザのデータが失われます。",
-"Wrong admin recovery password. Please check the password and try again." => "無効な復元用の管理者パスワード。パスワードを確認して再度実行してください。",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザの暗号化キーは正常に更新されました。",
+"No user supplied" => "ユーザーが指定されていません",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "リカバリ用の管理者パスワードを入力してください。そうでない場合は、全ユーザーのデータが失われます。",
+"Wrong admin recovery password. Please check the password and try again." => "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
 "Unable to change password" => "パスワードを変更できません",
-"Update to {appversion}" => "{appversion} に更新",
+"Sending..." => "送信中…",
+"User Documentation" => "ユーザードキュメント",
+"Admin Documentation" => "管理者ドキュメント",
+"Update to {appversion}" => "{appversion} にアップデート",
 "Disable" => "無効",
-"Enable" => "有効化",
+"Enable" => "有効にする",
 "Please wait...." => "しばらくお待ちください。",
 "Error while disabling app" => "アプリ無効化中にエラーが発生",
-"Error while enabling app" => "アプリ有効化中にエラーが発生",
+"Error while enabling app" => "アプリを有効にする際にエラーが発生",
 "Updating...." => "更新中....",
 "Error while updating app" => "アプリの更新中にエラーが発生",
 "Error" => "エラー",
-"Update" => "更新",
-"Updated" => "更新済み",
+"Update" => "アップデート",
+"Updated" => "アップデート済み",
 "Select a profile picture" => "プロファイル画像を選択",
+"Very weak password" => "非常に弱いパスワード",
+"Weak password" => "弱いパスワード",
+"So-so password" => "まずまずのパスワード",
+"Good password" => "良好なパスワード",
+"Strong password" => "強いパスワード",
 "Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
-"Saving..." => "保存中...",
 "deleted" => "削除",
 "undo" => "元に戻す",
-"Unable to remove user" => "ユーザを削除出来ません",
+"Unable to remove user" => "ユーザーを削除できません",
 "Groups" => "グループ",
 "Group Admin" => "グループ管理者",
 "Delete" => "削除",
 "add group" => "グループを追加",
-"A valid username must be provided" => "有効なユーザ名を指定する必要があります",
-"Error creating user" => "ユーザ作成エラー",
+"A valid username must be provided" => "有効なユーザー名を指定する必要があります",
+"Error creating user" => "ユーザー作成エラー",
 "A valid password must be provided" => "有効なパスワードを指定する必要があります",
-"Warning: Home directory for user \"{user}\" already exists" => "警告: ユーザ \"{user}\" のホームディレクトリはすでに存在します",
+"Warning: Home directory for user \"{user}\" already exists" => "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
 "__language_name__" => "Japanese (日本語)",
 "Everything (fatal issues, errors, warnings, info, debug)" => "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
-"Info, warnings, errors and fatal issues" => "情報と警告、エラー、致命的な問題",
-"Warnings, errors and fatal issues" => "警告とエラー、致命的な問題",
-"Errors and fatal issues" => "エラーと致命的な問題",
+"Info, warnings, errors and fatal issues" => "情報、警告、エラー、致命的な問題",
+"Warnings, errors and fatal issues" => "警告、エラー、致命的な問題",
+"Errors and fatal issues" => "エラー、致命的な問題",
 "Fatal issues only" => "致命的な問題のみ",
+"None" => "なし",
+"Login" => "ログイン",
+"Plain" => "平文",
+"NT LAN Manager" => "NT LAN マネージャー",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "セキュリティ警告",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "HTTP 経由で %s にアクセスしています。HTTPS を使用するようにサーバの設定を行うことを強くおすすめします。",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "HTTP経由で %s にアクセスしています。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." => "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリがアクセスされないようにウェブサーバーを設定するか、ウェブサーバーのドキュメントルートからデータディレクトリを移動するように強くお勧めします。",
 "Setup Warning" => "セットアップ警告",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインタフェースが動作していないと考えられるため、あなたのWEBサーバはまだファイルの同期を許可するように適切な設定がされていません。",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
 "Please double check the <a href=\"%s\">installation guides</a>." => "<a href=\"%s\">installation guides</a>をもう一度チェックするようにお願いいたします。",
 "Module 'fileinfo' missing" => "モジュール 'fileinfo' が見つかりません",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
-"Your PHP version is outdated" => "PHPバーションが古くなっております。",
-"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." => "PHPバーションが古くなっております。このプログラムが不正な行為を発生する可能性はある為、PHPバーション5.3.8以降にアップグレードをください。",
+"Your PHP version is outdated" => "PHPバーションが古くなっています。",
+"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." => "PHPバーションが古くなっています。古いバージョンには既知の問題があるため、5.3.8以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
 "Locale not working" => "ロケールが動作していません",
 "System locale can not be set to a one which supports UTF-8." => "システムロケールを UTF-8 をサポートするロケールに設定できません。",
 "This means that there might be problems with certain characters in file names." => "これは、ファイル名の特定の文字に問題があることを意味しています。",
@@ -71,25 +94,36 @@ $TRANSLATIONS = array(
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "各ページの読み込み時にタスクを実行する",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "HTTPを通して15分間隔で cron.php を実行するように、cron.php は webcron サービスに登録されています。",
-"Use systems cron service to call the cron.php file every 15 minutes." => "15分間隔で cron.php ファイルを実行するためにシステムの cron サービスを利用する",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
+"Use systems cron service to call the cron.php file every 15 minutes." => "システムのcronサービスを利用して15分ごとにcron.phpファイルを実行します。",
 "Sharing" => "共有",
 "Enable Share API" => "共有APIを有効にする",
 "Allow apps to use the Share API" => "アプリからの共有APIの利用を許可する",
 "Allow links" => "リンクを許可する",
-"Allow users to share items to the public with links" => "リンクによりアイテムを公開することを許可する",
+"Allow users to share items to the public with links" => "ユーザーがリンクによりアイテムを公開することを許可する",
 "Allow public uploads" => "パブリックなアップロードを許可",
-"Allow users to enable others to upload into their publicly shared folders" => "公開している共有フォルダへのアップロードを共有しているメンバーにも許可",
+"Allow users to enable others to upload into their publicly shared folders" => "公開している共有フォルダーへのアップロードを共有しているメンバーにも許可",
 "Allow resharing" => "再共有を許可する",
-"Allow users to share items shared with them again" => "ユーザが共有しているアイテムの再共有を許可する",
-"Allow users to share with anyone" => "ユーザが誰とでも共有することを許可する",
-"Allow users to only share with users in their groups" => "ユーザにグループ内のユーザとのみ共有を許可する",
+"Allow users to share items shared with them again" => "ユーザーが共有しているアイテムの再共有を許可する",
+"Allow users to share with anyone" => "ユーザーに誰とでも共有することを許可する",
+"Allow users to only share with users in their groups" => "ユーザーにグループ内のユーザーとのみ共有を許可する",
 "Allow mail notification" => "メール通知を許可",
-"Allow user to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザに許可する",
+"Allow user to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザーに許可する",
 "Security" => "セキュリティ",
 "Enforce HTTPS" => "常にHTTPSを使用する",
-"Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化する。",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "強制的なSSL接続を有効／無効にするために、HTTPS経由で %s へ接続してください。",
+"Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
+"Email Server" => "メールサーバー",
+"This is used for sending out notifications." => "これは通知の送信に使われます。",
+"From address" => "アドレスから",
+"Authentication required" => "要求される認証",
+"Server address" => "サーバーアドレス",
+"Port" => "ポート",
+"Credentials" => "資格情報",
+"SMTP Username" => "SMTP ユーザー名",
+"SMTP Password" => "SMTP パスワード",
+"Test email settings" => "メールテスト設定",
+"Send email" => "メールを送信",
 "Log" => "ログ",
 "Log level" => "ログレベル",
 "More" => "もっと見る",
@@ -99,14 +133,15 @@ $TRANSLATIONS = array(
 "Add your App" => "アプリを追加",
 "More Apps" => "さらにアプリを表示",
 "Select an App" => "アプリを選択してください",
+"Documentation:" => "ドキュメント:",
 "See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
+"See application website" => "アプリケーションのウェブサイトを見る",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
-"User Documentation" => "ユーザドキュメント",
 "Administrator Documentation" => "管理者ドキュメント",
 "Online Documentation" => "オンラインドキュメント",
 "Forum" => "フォーラム",
 "Bugtracker" => "バグトラッカー",
-"Commercial Support" => "コマーシャルサポート",
+"Commercial Support" => "商用サポート",
 "Get the apps to sync your files" => "ファイルを同期するためのアプリを取得",
 "Show First Run Wizard again" => "初回ウィザードを再表示する",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在、<strong>%s</strong> / <strong>%s</strong> を利用しています",
@@ -116,37 +151,36 @@ $TRANSLATIONS = array(
 "Current password" => "Current password",
 "New password" => "新しいパスワードを入力",
 "Change password" => "パスワードを変更",
-"Full Name" => "姓名",
+"Full Name" => "名前",
 "Email" => "メール",
 "Your email address" => "あなたのメールアドレス",
-"Fill in an email address to enable password recovery" => "※パスワード回復を有効にするにはメールアドレスの入力が必要です",
+"Fill in an email address to enable password recovery and receive notifications" => "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
 "Profile picture" => "プロフィール写真",
 "Upload new" => "新規にアップロード",
 "Select new from Files" => "ファイルから新規に選択",
 "Remove image" => "画像を削除",
 "Either png or jpg. Ideally square but you will be able to crop it." => "png と jpg のいずれか。正方形が理想ですが、切り取って加工することも可能です。",
 "Your avatar is provided by your original account." => "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
-"Abort" => "中止",
+"Cancel" => "キャンセル",
 "Choose as profile image" => "プロファイル画像として選択",
 "Language" => "言語",
 "Help translate" => "翻訳に協力する",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">WebDAV 経由でファイルにアクセス</a> するにはこのアドレスを利用してください",
-"Encryption" => "暗号化",
 "The encryption app is no longer enabled, please decrypt all your files" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
 "Log-in password" => "ログインパスワード",
 "Decrypt all Files" => "すべてのファイルを複合する",
 "Login Name" => "ログイン名",
 "Create" => "作成",
-"Admin Recovery Password" => "管理者復旧パスワード",
-"Enter the recovery password in order to recover the users files during password change" => "パスワード変更の間のユーザーのファイルを回復するために、リカバリパスワードを入力してください",
+"Admin Recovery Password" => "管理者リカバリパスワード",
+"Enter the recovery password in order to recover the users files during password change" => "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
 "Default Storage" => "デフォルトストレージ",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージの割り当てを入力してください (例: \"512MB\" や \"12 GB\")",
 "Unlimited" => "無制限",
 "Other" => "その他",
 "Username" => "ユーザー名",
 "Storage" => "ストレージ",
-"change full name" => "姓名を変更",
+"change full name" => "フルネームを変更",
 "set new password" => "新しいパスワードを設定",
 "Default" => "デフォルト"
 );
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index ba844736a5..88f6ef514d 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "იმეილი გაიგზავნა",
+"Encryption" => "ენკრიპცია",
 "Unable to load list from App Store" => "აპლიკაციების სია ვერ ჩამოიტვირთა App Store",
 "Authentication error" => "ავთენტიფიკაციის შეცდომა",
 "Group already exists" => "ჯგუფი უკვე არსებობს",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "მომხმარებლის დამატება ვერ მოხეხდა ჯგუფში %s",
 "Unable to remove user from group %s" => "მომხმარებლის წაშლა ვერ მოხეხდა ჯგუფიდან %s",
 "Couldn't update app." => "ვერ მოხერხდა აპლიკაციის განახლება.",
+"User Documentation" => "მომხმარებლის დოკუმენტაცია",
 "Update to {appversion}" => "განაახლე {appversion}–მდე",
 "Disable" => "გამორთვა",
 "Enable" => "ჩართვა",
@@ -23,7 +26,6 @@ $TRANSLATIONS = array(
 "Error" => "შეცდომა",
 "Update" => "განახლება",
 "Updated" => "განახლებულია",
-"Saving..." => "შენახვა...",
 "deleted" => "წაშლილი",
 "undo" => "დაბრუნება",
 "Unable to remove user" => "მომხმარებლის წაშლა ვერ მოხერხდა",
@@ -35,6 +37,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "შეცდომა მომხმარებლის შექმნისას",
 "A valid password must be provided" => "უნდა მიუთითოთ არსებული პაროლი",
 "__language_name__" => "__language_name__",
+"None" => "არა",
+"Login" => "ლოგინი",
 "Security Warning" => "უსაფრთხოების გაფრთხილება",
 "Setup Warning" => "გაფრთხილება დაყენებისას",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
@@ -55,6 +59,9 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის",
 "Security" => "უსაფრთხოება",
 "Enforce HTTPS" => "HTTPS–ის ჩართვა",
+"Server address" => "სერვერის მისამართი",
+"Port" => "პორტი",
+"Credentials" => "იუზერ/პაროლი",
 "Log" => "ლოგი",
 "Log level" => "ლოგირების დონე",
 "More" => "უფრო მეტი",
@@ -66,7 +73,6 @@ $TRANSLATIONS = array(
 "Select an App" => "აირჩიეთ აპლიკაცია",
 "See application page at apps.owncloud.com" => "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>",
-"User Documentation" => "მომხმარებლის დოკუმენტაცია",
 "Administrator Documentation" => "ადმინისტრატორის დოკუმენტაცია",
 "Online Documentation" => "ონლაინ დოკუმენტაცია",
 "Forum" => "ფორუმი",
@@ -83,11 +89,10 @@ $TRANSLATIONS = array(
 "Change password" => "პაროლის შეცვლა",
 "Email" => "იმეილი",
 "Your email address" => "თქვენი იმეილ მისამართი",
-"Fill in an email address to enable password recovery" => "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად",
+"Cancel" => "უარყოფა",
 "Language" => "ენა",
 "Help translate" => "თარგმნის დახმარება",
 "WebDAV" => "WebDAV",
-"Encryption" => "ენკრიპცია",
 "Login Name" => "მომხმარებლის სახელი",
 "Create" => "შექმნა",
 "Default Storage" => "საწყისი საცავი",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index f7d9faa38c..37bebc1c6f 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -1,5 +1,82 @@
 <?php
 $TRANSLATIONS = array(
-"Delete" => "លុប"
+"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
+"Unable to load list from App Store" => "មិនអាចផ្ទុកបញ្ជីកម្មវិធីពី App Store",
+"Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
+"Group already exists" => "មាន​ក្រុម​នេះ​រួច​ហើយ",
+"Unable to add group" => "មិន​អាច​បន្ថែម​ក្រុម",
+"Email saved" => "បាន​រក្សា​ទុក​អ៊ីមែល",
+"Invalid email" => "អ៊ីមែល​មិន​ត្រឹម​ត្រូវ",
+"Unable to delete group" => "មិន​អាច​លុប​ក្រុម​បាន",
+"Unable to delete user" => "មិន​អាច​លុប​អ្នក​ប្រើ​បាន",
+"Language changed" => "បាន​ប្ដូរ​ភាសា",
+"Invalid request" => "សំណើ​មិន​ត្រឹម​ត្រូវ",
+"Admins can't remove themself from the admin group" => "អ្នក​គ្រប់​គ្រង​មិន​អាច​លុប​ខ្លួន​ឯង​ចេញ​ពី​ក្រុម​អ្នក​គ្រប់​គ្រង​ឡើយ",
+"Unable to add user to group %s" => "មិន​អាច​បន្ថែម​អ្នក​ប្រើ​ទៅ​ក្រុម %s",
+"Unable to remove user from group %s" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ​ពី​ក្រុម​ %s",
+"Couldn't update app." => "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
+"User Documentation" => "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
+"Update to {appversion}" => "ធ្វើ​បច្ចុប្បន្នភាព​ទៅ {appversion}",
+"Disable" => "បិទ",
+"Enable" => "បើក",
+"Please wait...." => "សូម​រង់​ចាំ....",
+"Updating...." => "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព....",
+"Error while updating app" => "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី",
+"Error" => "កំហុស",
+"Update" => "ធ្វើ​បច្ចុប្បន្នភាព",
+"Updated" => "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
+"deleted" => "បាន​លុប",
+"undo" => "មិន​ធ្វើ​វិញ",
+"Unable to remove user" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ",
+"Groups" => "ក្រុ",
+"Group Admin" => "ក្រុម​អ្នក​គ្រប់គ្រង",
+"Delete" => "លុប",
+"add group" => "បន្ថែម​ក្រុម",
+"A valid username must be provided" => "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+"Error creating user" => "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
+"A valid password must be provided" => "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+"__language_name__" => "__language_name__",
+"Login" => "ចូល",
+"Security Warning" => "បម្រាម​សុវត្ថិភាព",
+"Setup Warning" => "បម្រាម​ការ​ដំឡើង",
+"Module 'fileinfo' missing" => "ខ្វះ​ម៉ូឌុល 'fileinfo'",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "ខ្វះ​ម៉ូឌុល 'fileinfo' ។ យើង​សូម​ណែនាំ​ឲ្យ​បើក​ម៉ូឌុល​នេះ ដើម្បី​ទទួល​បាន​លទ្ធផល​ល្អ​នៃ​ការ​សម្គាល់​ប្រភេទ mime ។",
+"Locale not working" => "Locale មិន​ដំណើរការ",
+"Internet connection not working" => "ការ​តភ្ជាប់​អ៊ីនធឺណិត​មិន​មាន​ដំណើរ​ការ",
+"Sharing" => "ការ​ចែក​រំលែក",
+"Enable Share API" => "បើក API ចែក​រំលែក",
+"Allow apps to use the Share API" => "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
+"Allow links" => "អនុញ្ញាត​តំណ",
+"Allow users to share items to the public with links" => "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​របស់​ទៅ​សាធារណៈ​ជាមួយ​តំណ",
+"Allow resharing" => "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
+"Allow users to share with anyone" => "អនុញ្ញាត​ឲ្យ​អ្នក​ប្រើ​ចែក​រំលែក​ជាមួយ​នរណា​ម្នាក់",
+"Security" => "សុវត្ថិភាព",
+"Enforce HTTPS" => "បង្ខំ HTTPS",
+"Server address" => "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
+"Log" => "Log",
+"Log level" => "កម្រិត Log",
+"More" => "ច្រើន​ទៀត",
+"Less" => "តិច",
+"Version" => "កំណែ",
+"Add your App" => "បន្ថែម​កម្មវិធី​របស់​អ្នក",
+"More Apps" => "កម្មវិធី​ច្រើន​ទៀត",
+"Select an App" => "ជ្រើស​កម្មវិធី​មួយ",
+"Administrator Documentation" => "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
+"Online Documentation" => "ឯកសារ Online",
+"Forum" => "វេទិកាពិភាក្សា",
+"Bugtracker" => "Bugtracker",
+"Password" => "ពាក្យសម្ងាត់",
+"Current password" => "ពាក្យសម្ងាត់​បច្ចុប្បន្ន",
+"New password" => "ពាក្យ​សម្ងាត់​ថ្មី",
+"Change password" => "ប្តូរ​ពាក្យសម្ងាត់",
+"Email" => "អ៊ីមែល",
+"Your email address" => "អ៊ីម៉ែល​របស់​អ្នក",
+"Cancel" => "លើកលែង",
+"Language" => "ភាសា",
+"Help translate" => "ជួយ​បក​ប្រែ",
+"WebDAV" => "WebDAV",
+"Login Name" => "ចូល",
+"Other" => "ផ្សេងៗ",
+"Username" => "ឈ្មោះ​អ្នកប្រើ"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 83c92bba0f..a4506975e8 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "이메일 발송됨",
+"Encryption" => "암호화",
 "Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
 "Authentication error" => "인증 오류",
 "Your full name has been changed." => "전체 이름이 변경되었습니다.",
@@ -22,6 +24,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다.",
 "Unable to change password" => "암호를 변경할 수 없음",
+"Sending..." => "보내는 중...",
+"User Documentation" => "사용자 문서",
+"Admin Documentation" => "운영자 문서",
 "Update to {appversion}" => "버전 {appversion}(으)로 업데이트",
 "Disable" => "사용 안함",
 "Enable" => "사용함",
@@ -34,8 +39,12 @@ $TRANSLATIONS = array(
 "Update" => "업데이트",
 "Updated" => "업데이트됨",
 "Select a profile picture" => "프로필 사진 선택",
+"Very weak password" => "매우 약한 암호",
+"Weak password" => "약한 암호",
+"So-so password" => "그저 그런 암호",
+"Good password" => "좋은 암호",
+"Strong password" => "강력한 암호",
 "Decrypting files... Please wait, this can take some time." => "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
-"Saving..." => "저장 중...",
 "deleted" => "삭제됨",
 "undo" => "실행 취소",
 "Unable to remove user" => "사용자를 삭제할 수 없음",
@@ -53,6 +62,10 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "경고, 오류, 치명적 문제",
 "Errors and fatal issues" => "오류, 치명적 문제",
 "Fatal issues only" => "치명적 문제만",
+"None" => "없음",
+"Login" => "로그인",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "보안 경고",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s에 HTTP로 접근하고 있습니다. 서버에서 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." => "데이터 디렉터리와 파일을 인터넷에서 접근할 수도 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 접근할 수 없도록 하거나, 웹 서버 문서 경로 외부로 데이터 디렉터리를 옮기십시오.",
@@ -90,6 +103,16 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "HTTPS 강제 사용",
 "Forces the clients to connect to %s via an encrypted connection." => "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
+"Email Server" => "전자우편 서버",
+"From address" => "보낸 이 주소",
+"Authentication required" => "인증 필요함",
+"Server address" => "서버 주소",
+"Port" => "포트",
+"Credentials" => "자격 정보",
+"SMTP Username" => "SMTP 사용자명",
+"SMTP Password" => "SMTP 암호",
+"Test email settings" => "시험용 전자우편 설정",
+"Send email" => "전자우편 보내기",
 "Log" => "로그",
 "Log level" => "로그 단계",
 "More" => "더 중요함",
@@ -99,9 +122,9 @@ $TRANSLATIONS = array(
 "Add your App" => "내 앱 추가",
 "More Apps" => "더 많은 앱",
 "Select an App" => "앱 선택",
+"Documentation:" => "문서",
 "See application page at apps.owncloud.com" => "apps.owncloud.com에 있는 앱 페이지를 참고하십시오",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-라이선스됨: <span class=\"author\"></span>",
-"User Documentation" => "사용자 문서",
 "Administrator Documentation" => "관리자 문서",
 "Online Documentation" => "온라인 문서",
 "Forum" => "포럼",
@@ -119,20 +142,18 @@ $TRANSLATIONS = array(
 "Full Name" => "전체 이름",
 "Email" => "이메일",
 "Your email address" => "이메일 주소",
-"Fill in an email address to enable password recovery" => "암호 찾기 기능을 사용하려면 이메일 주소를 입력하십시오",
 "Profile picture" => "프로필 사진",
 "Upload new" => "새로 업로드",
 "Select new from Files" => "파일에서 선택",
 "Remove image" => "그림 삭제",
 "Either png or jpg. Ideally square but you will be able to crop it." => "png나 jpg를 사용하십시오. 정사각형 형태가 가장 좋지만 잘라낼 수 있습니다.",
 "Your avatar is provided by your original account." => "원본 계정의 아바타를 사용합니다.",
-"Abort" => "중지",
+"Cancel" => "취소",
 "Choose as profile image" => "프로필 이미지로 사용",
 "Language" => "언어",
 "Help translate" => "번역 돕기",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "WebDAV로 파일에 접근하려면 <a href=\"%s\" target=\"_blank\">이 주소를 사용하십시오</a>",
-"Encryption" => "암호화",
 "The encryption app is no longer enabled, please decrypt all your files" => "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
 "Log-in password" => "로그인 암호",
 "Decrypt all Files" => "모든 파일 복호화",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index d0a8abea71..b5c40ae0a1 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,14 +1,18 @@
 <?php
 $TRANSLATIONS = array(
+"Encryption" => "نهێنیکردن",
 "Invalid request" => "داواکارى نادروستە",
 "Enable" => "چالاککردن",
 "Error" => "هه‌ڵه",
 "Update" => "نوێکردنه‌وه",
-"Saving..." => "پاشکه‌وتده‌کات...",
+"None" => "هیچ",
+"Login" => "چوونەژوورەوە",
+"Server address" => "ناونیشانی ڕاژه",
 "Password" => "وشەی تێپەربو",
 "New password" => "وشەی نهێنی نوێ",
 "Email" => "ئیمه‌یل",
-"Encryption" => "نهێنیکردن",
+"Cancel" => "لابردن",
+"Login Name" => "چوونەژوورەوە",
 "Username" => "ناوی به‌کارهێنه‌ر"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index ac8c1b6a16..f564527c5d 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email geschéckt",
 "Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
 "Authentication error" => "Authentifikatioun's Fehler",
 "Group already exists" => "Group existeiert schon.",
@@ -16,13 +17,13 @@ $TRANSLATIONS = array(
 "Enable" => "Aschalten",
 "Error" => "Fehler",
 "Update" => "Update",
-"Saving..." => "Speicheren...",
 "deleted" => "geläscht",
 "undo" => "réckgängeg man",
 "Groups" => "Gruppen",
 "Group Admin" => "Gruppen Admin",
 "Delete" => "Läschen",
 "__language_name__" => "__language_name__",
+"Login" => "Login",
 "Security Warning" => "Sécherheets Warnung",
 "Cron" => "Cron",
 "Enable Share API" => "Share API aschalten",
@@ -31,6 +32,7 @@ $TRANSLATIONS = array(
 "Allow resharing" => "Resharing erlaben",
 "Allow users to share with anyone" => "Useren erlaben mat egal wiem ze sharen",
 "Allow users to only share with users in their groups" => "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen",
+"Server address" => "Server Adress",
 "Log" => "Log",
 "More" => "Méi",
 "Less" => "Manner",
@@ -44,9 +46,10 @@ $TRANSLATIONS = array(
 "Change password" => "Passwuert änneren",
 "Email" => "Email",
 "Your email address" => "Deng Email Adress",
-"Fill in an email address to enable password recovery" => "Gëff eng Email Adress an fir d'Passwuert recovery ze erlaben",
+"Cancel" => "Ofbriechen",
 "Language" => "Sprooch",
 "Help translate" => "Hëllef iwwersetzen",
+"Login Name" => "Login",
 "Create" => "Erstellen",
 "Other" => "Aner",
 "Username" => "Benotzernumm"
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index f2cb6a3026..d86d5086f0 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Laiškas išsiųstas",
+"Encryption" => "Šifravimas",
 "Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
 "Authentication error" => "Autentikacijos klaida",
 "Group already exists" => "Grupė jau egzistuoja",
@@ -20,6 +22,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.",
 "Unable to change password" => "Nepavyksta pakeisti slaptažodžio",
+"User Documentation" => "Naudotojo dokumentacija",
 "Update to {appversion}" => "Atnaujinti iki {appversion}",
 "Disable" => "Išjungti",
 "Enable" => "Įjungti",
@@ -33,7 +36,6 @@ $TRANSLATIONS = array(
 "Updated" => "Atnaujinta",
 "Select a profile picture" => "Pažymėkite profilio paveikslėlį",
 "Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
-"Saving..." => "Saugoma...",
 "deleted" => "ištrinta",
 "undo" => "anuliuoti",
 "Unable to remove user" => "Nepavyko ištrinti vartotojo",
@@ -46,6 +48,9 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Slaptažodis turi būti tinkamas",
 "Warning: Home directory for user \"{user}\" already exists" => "Įspėjimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja",
 "__language_name__" => "Kalba",
+"Fatal issues only" => "Tik kritinės problemos",
+"None" => "Nieko",
+"Login" => "Prisijungti",
 "Security Warning" => "Saugumo pranešimas",
 "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." => "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko.",
 "Setup Warning" => "Nustatyti perspėjimą",
@@ -77,6 +82,8 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Reikalauti HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Verčia klientus jungtis prie %s per šifruotą ryšį.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
+"Server address" => "Serverio adresas",
+"Port" => "Prievadas",
 "Log" => "Žurnalas",
 "Log level" => "Žurnalo išsamumas",
 "More" => "Daugiau",
@@ -88,7 +95,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Pasirinkite programą",
 "See application page at apps.owncloud.com" => "Žiūrėti programos puslapį svetainėje apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
-"User Documentation" => "Naudotojo dokumentacija",
 "Administrator Documentation" => "Administratoriaus dokumentacija",
 "Online Documentation" => "Dokumentacija tinkle",
 "Forum" => "Forumas",
@@ -103,21 +109,20 @@ $TRANSLATIONS = array(
 "Current password" => "Dabartinis slaptažodis",
 "New password" => "Naujas slaptažodis",
 "Change password" => "Pakeisti slaptažodį",
+"Full Name" => "Pilnas vardas",
 "Email" => "El. Paštas",
 "Your email address" => "Jūsų el. pašto adresas",
-"Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
 "Profile picture" => "Profilio paveikslėlis",
 "Upload new" => "Įkelti naują",
 "Select new from Files" => "Pasirinkti naują iš failų",
 "Remove image" => "Pašalinti paveikslėlį",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti.",
-"Abort" => "Atšaukti",
+"Cancel" => "Atšaukti",
 "Choose as profile image" => "Pasirinkite profilio paveiksliuką",
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Naudokite šį adresą, kad <a href=\"%s\" target=\"_blank\">pasiektumėte savo failus per WebDAV</a>",
-"Encryption" => "Šifravimas",
 "Log-in password" => "Prisijungimo slaptažodis",
 "Decrypt all Files" => "Iššifruoti visus failus",
 "Login Name" => "Vartotojo vardas",
@@ -129,6 +134,7 @@ $TRANSLATIONS = array(
 "Other" => "Kita",
 "Username" => "Prisijungimo vardas",
 "Storage" => "Saugojimas",
+"change full name" => "keisti pilną vardą",
 "set new password" => "nustatyti naują slaptažodį",
 "Default" => "Numatytasis"
 );
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index de5d6460d6..7d5f964a96 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Vēstule nosūtīta",
+"Encryption" => "Šifrēšana",
 "Unable to load list from App Store" => "Nevar lejupielādēt sarakstu no lietotņu veikala",
 "Authentication error" => "Autentifikācijas kļūda",
 "Group already exists" => "Grupa jau eksistē",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Nevar pievienot lietotāju grupai %s",
 "Unable to remove user from group %s" => "Nevar izņemt lietotāju no grupas %s",
 "Couldn't update app." => "Nevarēja atjaunināt lietotni.",
+"User Documentation" => "Lietotāja dokumentācija",
 "Update to {appversion}" => "Atjaunināt uz {appversion}",
 "Disable" => "Deaktivēt",
 "Enable" => "Aktivēt",
@@ -24,7 +27,6 @@ $TRANSLATIONS = array(
 "Update" => "Atjaunināt",
 "Updated" => "Atjaunināta",
 "Decrypting files... Please wait, this can take some time." => "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
-"Saving..." => "Saglabā...",
 "deleted" => "izdzests",
 "undo" => "atsaukt",
 "Unable to remove user" => "Nevar izņemt lietotāju",
@@ -36,6 +38,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Kļūda, veidojot lietotāju",
 "A valid password must be provided" => "Jānorāda derīga parole",
 "__language_name__" => "__valodas_nosaukums__",
+"None" => "Nav",
+"Login" => "Ierakstīties",
 "Security Warning" => "Brīdinājums par drošību",
 "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." => "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes.",
 "Setup Warning" => "Iestatīšanas brīdinājums",
@@ -63,6 +67,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Uzspiest HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
+"Server address" => "Servera adrese",
+"Port" => "Ports",
+"Credentials" => "Akreditācijas dati",
 "Log" => "Žurnāls",
 "Log level" => "Žurnāla līmenis",
 "More" => "Vairāk",
@@ -74,7 +81,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Izvēlies lietotni",
 "See application page at apps.owncloud.com" => "Apskati lietotņu lapu — apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>",
-"User Documentation" => "Lietotāja dokumentācija",
 "Administrator Documentation" => "Administratora dokumentācija",
 "Online Documentation" => "Tiešsaistes dokumentācija",
 "Forum" => "Forums",
@@ -91,11 +97,10 @@ $TRANSLATIONS = array(
 "Change password" => "Mainīt paroli",
 "Email" => "E-pasts",
 "Your email address" => "Jūsu e-pasta adrese",
-"Fill in an email address to enable password recovery" => "Ievadiet e-pasta adresi, lai vēlāk varētu atgūt paroli, ja būs nepieciešamība",
+"Cancel" => "Atcelt",
 "Language" => "Valoda",
 "Help translate" => "Palīdzi tulkot",
 "WebDAV" => "WebDAV",
-"Encryption" => "Šifrēšana",
 "Log-in password" => "Pieslēgšanās parole",
 "Decrypt all Files" => "Atšifrēt visus failus",
 "Login Name" => "Ierakstīšanās vārds",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index f9b4bbc942..00f2c7c2ad 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Е-порака пратена",
+"Encryption" => "Енкрипција",
 "Unable to load list from App Store" => "Неможам да вчитам листа од App Store",
 "Authentication error" => "Грешка во автентикација",
 "Group already exists" => "Групата веќе постои",
@@ -17,6 +19,7 @@ $TRANSLATIONS = array(
 "Wrong password" => "Погрешна лозинка",
 "No user supplied" => "Нема корисничко име",
 "Unable to change password" => "Вашата лозинка неможе да се смени",
+"User Documentation" => "Корисничка документација",
 "Update to {appversion}" => "Надгради на {appversion}",
 "Disable" => "Оневозможи",
 "Enable" => "Овозможи",
@@ -29,7 +32,6 @@ $TRANSLATIONS = array(
 "Update" => "Ажурирај",
 "Updated" => "Надграден",
 "Select a profile picture" => "Одбери фотографија за профилот",
-"Saving..." => "Снимам...",
 "deleted" => "избришан",
 "undo" => "врати",
 "Unable to remove user" => "Не можам да го одстранам корисникот",
@@ -41,6 +43,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Грешка при креирање на корисникот",
 "A valid password must be provided" => "Мора да се обезбеди валидна лозинка",
 "__language_name__" => "__language_name__",
+"None" => "Ништо",
+"Login" => "Најава",
 "Security Warning" => "Безбедносно предупредување",
 "Setup Warning" => "Предупредување при подесување",
 "Locale not working" => "Локалето не функционира",
@@ -56,6 +60,8 @@ $TRANSLATIONS = array(
 "Allow user to send mail notification for shared files" => "Овозможи корисник да испраќа известување по електронска пошта за споделени датотеки",
 "Security" => "Безбедност",
 "Enforce HTTPS" => "Наметни HTTPS",
+"Server address" => "Адреса на сервер",
+"Port" => "Порта",
 "Log" => "Записник",
 "Log level" => "Ниво на логирање",
 "More" => "Повеќе",
@@ -67,7 +73,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Избери аппликација",
 "See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>",
-"User Documentation" => "Корисничка документација",
 "Administrator Documentation" => "Администраторска документација",
 "Online Documentation" => "Документација на интернет",
 "Forum" => "Форум",
@@ -82,18 +87,16 @@ $TRANSLATIONS = array(
 "Change password" => "Смени лозинка",
 "Email" => "Е-пошта",
 "Your email address" => "Вашата адреса за е-пошта",
-"Fill in an email address to enable password recovery" => "Пополни ја адресата за е-пошта за да може да ја обновуваш лозинката",
 "Profile picture" => "Фотографија за профил",
 "Upload new" => "Префрли нова",
 "Select new from Files" => "Одбери нова од датотеките",
 "Remove image" => "Отстрани ја фотографијата",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Мора де биде png или jpg. Идеално квадрат, но ќе бидете во можност да ја исечете.",
-"Abort" => "Прекини",
+"Cancel" => "Откажи",
 "Choose as profile image" => "Одбери фотографија за профилот",
 "Language" => "Јазик",
 "Help translate" => "Помогни во преводот",
 "WebDAV" => "WebDAV",
-"Encryption" => "Енкрипција",
 "Log-in password" => "Лозинка за најавување",
 "Decrypt all Files" => "Дешифрирај ги сите датотеки",
 "Login Name" => "Име за најава",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 0ba601dd72..1c5d118946 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -9,12 +9,13 @@ $TRANSLATIONS = array(
 "Enable" => "Aktif",
 "Error" => "Ralat",
 "Update" => "Kemaskini",
-"Saving..." => "Simpan...",
 "deleted" => "dihapus",
 "Groups" => "Kumpulan",
 "Delete" => "Padam",
 "__language_name__" => "_nama_bahasa_",
+"Login" => "Log masuk",
 "Security Warning" => "Amaran keselamatan",
+"Server address" => "Alamat pelayan",
 "Log" => "Log",
 "Log level" => "Tahap Log",
 "More" => "Lanjutan",
@@ -28,10 +29,11 @@ $TRANSLATIONS = array(
 "Change password" => "Ubah kata laluan",
 "Email" => "Email",
 "Your email address" => "Alamat emel anda",
-"Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
 "Profile picture" => "Gambar profil",
+"Cancel" => "Batal",
 "Language" => "Bahasa",
 "Help translate" => "Bantu terjemah",
+"Login Name" => "Log masuk",
 "Create" => "Buat",
 "Other" => "Lain",
 "Username" => "Nama pengguna"
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
index f49a9c1802..070e4dd73b 100644
--- a/settings/l10n/my_MM.php
+++ b/settings/l10n/my_MM.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Security Warning" => "လုံခြုံရေးသတိပေးချက်",
 "Password" => "စကားဝှက်",
 "New password" => "စကားဝှက်အသစ်",
+"Cancel" => "ပယ်ဖျက်မည်",
 "Username" => "သုံးစွဲသူအမည်"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index cb3e7c670c..40cca41638 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,7 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "E-post sendt",
+"Encryption" => "Kryptering",
 "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
 "Authentication error" => "Autentiseringsfeil",
+"Your full name has been changed." => "Ditt fulle navn er blitt endret.",
+"Unable to change full name" => "Klarte ikke å endre fullt navn",
 "Group already exists" => "Gruppen finnes allerede",
 "Unable to add group" => "Kan ikke legge til gruppe",
 "Email saved" => "Epost lagret",
@@ -14,16 +18,26 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
 "Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
 "Couldn't update app." => "Kunne ikke oppdatere app.",
+"Wrong password" => "Feil passord",
+"No user supplied" => "Ingen bruker angitt",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt",
+"Wrong admin recovery password. Please check the password and try again." => "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.",
+"Unable to change password" => "Kunne ikke endre passord",
+"User Documentation" => "Brukerdokumentasjon",
 "Update to {appversion}" => "Oppdater til {appversion}",
 "Disable" => "Slå avBehandle ",
 "Enable" => "Aktiver",
 "Please wait...." => "Vennligst vent...",
+"Error while disabling app" => "Deaktivering av app feilet",
+"Error while enabling app" => "Aktivering av app feilet",
 "Updating...." => "Oppdaterer...",
 "Error while updating app" => "Feil ved oppdatering av app",
 "Error" => "Feil",
 "Update" => "Oppdater",
 "Updated" => "Oppdatert",
-"Saving..." => "Lagrer...",
+"Select a profile picture" => "Velg et profilbilde",
+"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
 "deleted" => "slettet",
 "undo" => "angre",
 "Unable to remove user" => "Kunne ikke slette bruker",
@@ -34,27 +48,54 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "Oppgi et gyldig brukernavn",
 "Error creating user" => "Feil ved oppretting av bruker",
 "A valid password must be provided" => "Oppgi et gyldig passord",
+"Warning: Home directory for user \"{user}\" already exists" => "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede",
 "__language_name__" => "__language_name__",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Alt (fatale problemer, feil, advarsler, info, debug)",
+"Info, warnings, errors and fatal issues" => "Info, advarsler, feil og fatale problemer",
+"Warnings, errors and fatal issues" => "Advarsler, feil og fatale problemer",
+"Errors and fatal issues" => "Feil og fatale problemer",
+"Fatal issues only" => "Kun fatale problemer",
+"None" => "Ingen",
+"Login" => "Logg inn",
 "Security Warning" => "Sikkerhetsadvarsel",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du aksesserer %s via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve bruk av HTTPS i stedet.",
+"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." => "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer. Vi anbefaler på det sterkeste at du konfigurerer web-serveren din slik at datamappen ikke lenger er tilgjengelig eller at du flytter datamappen ut av web-serverens dokument-rotmappe.",
 "Setup Warning" => "Installasjonsadvarsel",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Vennligst dobbeltsjekk <a href=\"%s\">installasjonsveilederne</a>.",
 "Module 'fileinfo' missing" => "Modulen 'fileinfo' mangler",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modulen 'fileinfo' mangler. Vi anbefaler at du aktiverer denne modulen for å kunne detektere mime-typen korrekt.",
+"Your PHP version is outdated" => "Din PHP-versjon er udatert",
+"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." => "PHP-versjonen din er utdatert. Vi anbefaler på det sterkeste at du oppdaterer til 5.3.8 eller nyere fordi eldre versjoner ikke vil virke. Det er mulig at denne installasjoner ikke fungerer korrekt.",
 "Locale not working" => "Språk virker ikke",
+"System locale can not be set to a one which supports UTF-8." => "Kan ikke sette systemets nasjonale innstillinger til en som støtter UTF-8.",
+"This means that there might be problems with certain characters in file names." => "Dette betyr at det kan forekomme problemer med visse tegn i filnavn.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
 "Internet connection not working" => "Ingen internettilkopling",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, slik som montering av ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Utfør en oppgave med hver side som blir lastet",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php er registrert i en webcron-tjeneste for å kalle cron.php hvert 15. minutt over http.",
+"Use systems cron service to call the cron.php file every 15 minutes." => "Bruk systemets cron-tjeneste for å kalle cron.php hvert 15. minutt.",
 "Sharing" => "Deling",
 "Enable Share API" => "Aktiver API for Deling",
 "Allow apps to use the Share API" => "Tillat apps å bruke API for Deling",
 "Allow links" => "Tillat lenker",
-"Allow users to share items to the public with links" => "Tillat brukere å dele filer med lenker",
+"Allow users to share items to the public with links" => "Tillat brukere å dele filer offentlig med lenker",
+"Allow public uploads" => "Tillat offentlig opplasting",
+"Allow users to enable others to upload into their publicly shared folders" => "Tillat at brukere lar andre laste opp til deres offentlig delte mapper",
 "Allow resharing" => "TIllat videredeling",
 "Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
 "Allow users to share with anyone" => "Tillat brukere å dele med alle",
 "Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
+"Allow mail notification" => "Tillat påminnelser i e-post",
+"Allow user to send mail notification for shared files" => "Tillat at brukere sender epost-påminnelser for delte filer",
 "Security" => "Sikkerhet",
 "Enforce HTTPS" => "Tving HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Tvinger klientene til å koble til %s via en kryptert forbindelse.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL.",
+"Server address" => "Server-adresse",
+"Port" => "Port",
 "Log" => "Logg",
 "Log level" => "Loggnivå",
 "More" => "Mer",
@@ -66,7 +107,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Velg en app",
 "See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>",
-"User Documentation" => "Brukerdokumentasjon",
 "Administrator Documentation" => "Administratordokumentasjon",
 "Online Documentation" => "Online dokumentasjon",
 "Forum" => "Forum",
@@ -81,21 +121,35 @@ $TRANSLATIONS = array(
 "Current password" => "Nåværende passord",
 "New password" => "Nytt passord",
 "Change password" => "Endre passord",
+"Full Name" => "Fullt navn",
 "Email" => "Epost",
 "Your email address" => "Din e-postadresse",
-"Fill in an email address to enable password recovery" => "Oppi epostadressen du vil tilbakestille passordet for",
 "Profile picture" => "Profilbilde",
+"Upload new" => "Last opp nytt",
+"Select new from Files" => "Velg nytt fra Filer",
+"Remove image" => "Fjern bilde",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Enten png eller jpg. Helst kvadratisk men du kan beskjære det.",
+"Your avatar is provided by your original account." => "Avataren din kommer fra din opprinnelige konto.",
+"Cancel" => "Avbryt",
+"Choose as profile image" => "Velg som profilbilde",
 "Language" => "Språk",
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
-"Encryption" => "Kryptering",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressen for å <a href=\"%s\" target=\"_blank\">aksessere filene dine via WebDAV</a>",
+"The encryption app is no longer enabled, please decrypt all your files" => "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine",
+"Log-in password" => "Innloggingspassord",
+"Decrypt all Files" => "Dekrypter alle filer",
 "Login Name" => "Logginn navn",
 "Create" => "Opprett",
+"Admin Recovery Password" => "Administrativt gjenopprettingspassord",
+"Enter the recovery password in order to recover the users files during password change" => "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
 "Default Storage" => "Standard lager",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Legg inn lagringskvote (f.eks. \"512 MB\" eller \"12 GB\")",
 "Unlimited" => "Ubegrenset",
 "Other" => "Annet",
 "Username" => "Brukernavn",
 "Storage" => "Lager",
+"change full name" => "endre fullt navn",
 "set new password" => "sett nytt passord",
 "Default" => "Standard"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 9931063ac9..c497eb12a6 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Ongeldige waarde voor %s",
+"Saved" => "Bewaard",
+"test email settings" => "test e-mailinstellingen",
+"If you received this email, the settings seem to be correct." => "Als u dit e-mailbericht ontvangt, lijken de instellingen juist.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.",
+"Email sent" => "E-mail verzonden",
+"You need to set your user email before being able to send test emails." => "U moet uw e-mailadres instellen voordat u testberichten kunt versturen.",
+"Send mode" => "Verstuurmodus",
+"Encryption" => "Versleuteling",
+"Authentication method" => "Authenticatiemethode",
 "Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
 "Authentication error" => "Authenticatie fout",
 "Your full name has been changed." => "Uw volledige naam is gewijzigd.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
 "Unable to change password" => "Kan wachtwoord niet wijzigen",
+"Sending..." => "Versturen...",
+"User Documentation" => "Gebruikersdocumentatie",
+"Admin Documentation" => "Beheerdocumentatie",
 "Update to {appversion}" => "Bijwerken naar {appversion}",
 "Disable" => "Uitschakelen",
 "Enable" => "Activeer",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Bijwerken",
 "Updated" => "Bijgewerkt",
 "Select a profile picture" => "Kies een profielafbeelding",
+"Very weak password" => "Zeer zwak wachtwoord",
+"Weak password" => "Zwak wachtwoord",
+"So-so password" => "Matig wachtwoord",
+"Good password" => "Goed wachtwoord",
+"Strong password" => "Sterk wachtwoord",
 "Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
-"Saving..." => "Opslaan",
 "deleted" => "verwijderd",
 "undo" => "ongedaan maken",
 "Unable to remove user" => "Kon gebruiker niet verwijderen",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Waarschuwingen, fouten en fatale problemen",
 "Errors and fatal issues" => "Fouten en fatale problemen",
 "Fatal issues only" => "Alleen fatale problemen",
+"None" => "Geen",
+"Login" => "Login",
+"Plain" => "Gewoon",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Beveiligingswaarschuwing",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "U bent met %s verbonden over HTTP. We adviseren met klem uw server zo te configureren dat allen HTTPS kan worden gebruikt.",
 "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." => "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver.",
@@ -70,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Internet verbinding werkt niet",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Laatst uitgevoerde cron op %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
+"Cron was not executed yet!" => "Cron is nog niet uitgevoerd!",
 "Execute one task with each page loaded" => "Bij laden van elke pagina één taak uitvoeren",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php is geregisteerd bij een webcron service om elke 15 minuten cron.php over http aan te roepen.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Gebruik de systeem cron service om cron.php elke 15 minuten aan te roepen.",
@@ -90,6 +116,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Afdwingen HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Dwingt de clients om een versleutelde verbinding te maken met %s",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
+"Email Server" => "E-mailserver",
+"This is used for sending out notifications." => "Dit wordt gestuurd voor het verzenden van meldingen.",
+"From address" => "Afzenderadres",
+"Authentication required" => "Authenticatie vereist",
+"Server address" => "Server adres",
+"Port" => "Poort",
+"Credentials" => "Inloggegevens",
+"SMTP Username" => "SMTP gebruikersnaam",
+"SMTP Password" => "SMTP wachtwoord",
+"Test email settings" => "Test e-mailinstellingen",
+"Send email" => "Versturen e-mail",
 "Log" => "Log",
 "Log level" => "Log niveau",
 "More" => "Meer",
@@ -99,9 +136,10 @@ $TRANSLATIONS = array(
 "Add your App" => "App toevoegen",
 "More Apps" => "Meer apps",
 "Select an App" => "Selecteer een app",
+"Documentation:" => "Documentatie:",
 "See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
+"See application website" => "Zie website van de applicatie",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>",
-"User Documentation" => "Gebruikersdocumentatie",
 "Administrator Documentation" => "Beheerdersdocumentatie",
 "Online Documentation" => "Online documentatie",
 "Forum" => "Forum",
@@ -119,25 +157,24 @@ $TRANSLATIONS = array(
 "Full Name" => "Volledige naam",
 "Email" => "E-mailadres",
 "Your email address" => "Uw e-mailadres",
-"Fill in an email address to enable password recovery" => "Vul een mailadres in om je wachtwoord te kunnen herstellen",
+"Fill in an email address to enable password recovery and receive notifications" => "Vul een e-mailbericht in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen",
 "Profile picture" => "Profielafbeelding",
 "Upload new" => "Upload een nieuwe",
 "Select new from Files" => "Selecteer een nieuwe vanuit bestanden",
 "Remove image" => "Verwijder afbeelding",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Of png, of jpg. Bij voorkeur vierkant, maar u kunt bijsnijden.",
 "Your avatar is provided by your original account." => "Uw avatar is verstrekt door uw originele account.",
-"Abort" => "Afbreken",
+"Cancel" => "Annuleer",
 "Choose as profile image" => "Kies als profielafbeelding",
 "Language" => "Taal",
 "Help translate" => "Help met vertalen",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Gebruik deze link <a href=\"%s\" target=\"_blank\">om uw bestanden via WebDAV te benaderen</a>",
-"Encryption" => "Versleuteling",
 "The encryption app is no longer enabled, please decrypt all your files" => "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
 "Log-in password" => "Inlog-wachtwoord",
 "Decrypt all Files" => "Decodeer alle bestanden",
 "Login Name" => "Inlognaam",
-"Create" => "Creëer",
+"Create" => "Aanmaken",
 "Admin Recovery Password" => "Beheer herstel wachtwoord",
 "Enter the recovery password in order to recover the users files during password change" => "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
 "Default Storage" => "Standaard Opslaglimiet",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 5fd2f57b5a..7eacdbedfb 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "E-post sendt",
+"Encryption" => "Kryptering",
 "Unable to load list from App Store" => "Klarer ikkje å lasta inn liste fra app-butikken",
 "Authentication error" => "Autentiseringsfeil",
 "Group already exists" => "Gruppa finst allereie",
@@ -20,6 +22,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.",
 "Unable to change password" => "Klarte ikkje å endra passordet",
+"User Documentation" => "Brukardokumentasjon",
 "Update to {appversion}" => "Oppdater til {appversion}",
 "Disable" => "Slå av",
 "Enable" => "Slå på",
@@ -33,7 +36,6 @@ $TRANSLATIONS = array(
 "Updated" => "Oppdatert",
 "Select a profile picture" => "Vel eit profilbilete",
 "Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
-"Saving..." => "Lagrar …",
 "deleted" => "sletta",
 "undo" => "angra",
 "Unable to remove user" => "Klarte ikkje fjerna brukaren",
@@ -45,6 +47,7 @@ $TRANSLATIONS = array(
 "Error creating user" => "Feil ved oppretting av brukar",
 "A valid password must be provided" => "Du må oppgje eit gyldig passord",
 "__language_name__" => "Nynorsk",
+"Login" => "Logg inn",
 "Security Warning" => "Tryggleiksåtvaring",
 "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." => "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.",
 "Setup Warning" => "Oppsettsåtvaring",
@@ -72,6 +75,7 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Krev HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
+"Server address" => "Tenaradresse",
 "Log" => "Logg",
 "Log level" => "Log nivå",
 "More" => "Meir",
@@ -83,7 +87,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Vel eit program",
 "See application page at apps.owncloud.com" => "Sjå programsida på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>",
-"User Documentation" => "Brukardokumentasjon",
 "Administrator Documentation" => "Administratordokumentasjon",
 "Online Documentation" => "Dokumentasjon på nett",
 "Forum" => "Forum",
@@ -100,18 +103,16 @@ $TRANSLATIONS = array(
 "Change password" => "Endra passord",
 "Email" => "E-post",
 "Your email address" => "Di epost-adresse",
-"Fill in an email address to enable password recovery" => "Fyll inn e-postadressa di for å gjera passordgjenoppretting mogleg",
 "Profile picture" => "Profilbilete",
 "Upload new" => "Last opp ny",
 "Select new from Files" => "Vel ny frå Filer",
 "Remove image" => "Fjern bilete",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det.",
-"Abort" => "Avbryt",
+"Cancel" => "Avbryt",
 "Choose as profile image" => "Vel som profilbilete",
 "Language" => "Språk",
 "Help translate" => "Hjelp oss å omsetja",
 "WebDAV" => "WebDAV",
-"Encryption" => "Kryptering",
 "Log-in password" => "Innloggingspassord",
 "Decrypt all Files" => "Dekrypter alle filene",
 "Login Name" => "Innloggingsnamn",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 7606ac5992..f6eab80bcb 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -15,13 +15,13 @@ $TRANSLATIONS = array(
 "Disable" => "Desactiva",
 "Enable" => "Activa",
 "Error" => "Error",
-"Saving..." => "Enregistra...",
 "deleted" => "escafat",
 "undo" => "defar",
 "Groups" => "Grops",
 "Group Admin" => "Grop Admin",
 "Delete" => "Escafa",
 "__language_name__" => "__language_name__",
+"Login" => "Login",
 "Security Warning" => "Avertiment de securitat",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Executa un prètfach amb cada pagina cargada",
@@ -41,9 +41,10 @@ $TRANSLATIONS = array(
 "Change password" => "Cambia lo senhal",
 "Email" => "Corrièl",
 "Your email address" => "Ton adreiça de corrièl",
-"Fill in an email address to enable password recovery" => "Emplena una adreiça de corrièl per permetre lo mandadís del senhal perdut",
+"Cancel" => "Annula",
 "Language" => "Lenga",
 "Help translate" => "Ajuda a la revirada",
+"Login Name" => "Login",
 "Create" => "Crea",
 "Other" => "Autres",
 "Username" => "Non d'usancièr"
diff --git a/settings/l10n/pa.php b/settings/l10n/pa.php
index 795a80f7d4..aa83e11266 100644
--- a/settings/l10n/pa.php
+++ b/settings/l10n/pa.php
@@ -7,7 +7,6 @@ $TRANSLATIONS = array(
 "Updating...." => "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
 "Error" => "ਗਲਤੀ",
 "Updated" => "ਅੱਪਡੇਟ ਕੀਤਾ",
-"Saving..." => "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
 "deleted" => "ਹਟਾਈ",
 "undo" => "ਵਾਪਸ",
 "Groups" => "ਗਰੁੱਪ",
@@ -15,10 +14,14 @@ $TRANSLATIONS = array(
 "Delete" => "ਹਟਾਓ",
 "add group" => "ਗਰੁੱਪ ਸ਼ਾਮਲ",
 "__language_name__" => "__ਭਾਸ਼ਾ_ਨਾਂ__",
+"Login" => "ਲਾਗਇਨ",
 "Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
 "Setup Warning" => "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ",
+"Server address" => "ਸਰਵਰ ਐਡਰੈਸ",
 "Password" => "ਪਾਸਵਰ",
 "Change password" => "ਪਾਸਵਰਡ ਬਦਲੋ",
+"Cancel" => "ਰੱਦ ਕਰੋ",
+"Login Name" => "ਲਾਗਇਨ",
 "Username" => "ਯੂਜ਼ਰ-ਨਾਂ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index bd6d3dbf1c..640e1df958 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Nieprawidłowa wartość %s",
+"Saved" => "Zapisano",
+"test email settings" => "przetestuj ustawienia email",
+"If you received this email, the settings seem to be correct." => "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Pojawił się problem podczas wysyłania e-mail. Proszę sprawdzić ponownie ustawienia",
+"Email sent" => "E-mail wysłany",
+"You need to set your user email before being able to send test emails." => "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
+"Send mode" => "Tryb wysyłki",
+"Encryption" => "Szyfrowanie",
+"Authentication method" => "Metoda autentykacji",
 "Unable to load list from App Store" => "Nie można wczytać listy aplikacji",
 "Authentication error" => "Błąd uwierzytelniania",
 "Your full name has been changed." => "Twoja pełna nazwa została zmieniona.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.",
 "Unable to change password" => "Nie można zmienić hasła",
+"Sending..." => "Wysyłam...",
+"User Documentation" => "Dokumentacja użytkownika",
+"Admin Documentation" => "Dokumentacja Administratora",
 "Update to {appversion}" => "Aktualizacja do {appversion}",
 "Disable" => "Wyłącz",
 "Enable" => "Włącz",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Aktualizuj",
 "Updated" => "Zaktualizowano",
 "Select a profile picture" => "Wybierz zdjęcie profilu",
+"Very weak password" => "Bardzo słabe hasło",
+"Weak password" => "Słabe hasło",
+"So-so password" => "Mało skomplikowane hasło",
+"Good password" => "Dobre hasło",
+"Strong password" => "Mocne hasło",
 "Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
-"Saving..." => "Zapisywanie...",
 "deleted" => "usunięto",
 "undo" => "cofnij",
 "Unable to remove user" => "Nie można usunąć użytkownika",
@@ -53,7 +70,14 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Ostrzeżenia, błędy i poważne problemy",
 "Errors and fatal issues" => "Błędy i poważne problemy",
 "Fatal issues only" => "Tylko poważne problemy",
+"None" => "Nic",
+"Login" => "Login",
+"Plain" => "Czysty tekst",
+"NT LAN Manager" => "NT LAN Manager",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Uzyskujesz dostęp do %s za pomocą protokołu HTTP. Zalecamy skonfigurować swój serwer z użyciem protokołu 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." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
 "Setup Warning" => "Ostrzeżenia konfiguracji",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
@@ -64,9 +88,14 @@ $TRANSLATIONS = array(
 "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." => "Twoja wersja PHP jest za stara. Rekomendujemy przynajmniej wersje 5.3.8. Jeśli masz starsza wersję ownCloud może nie działać poprawnie.",
 "Locale not working" => "Lokalizacja nie działa",
 "System locale can not be set to a one which supports UTF-8." => "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
+"This means that there might be problems with certain characters in file names." => "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
+"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s.",
 "Internet connection not working" => "Połączenie internetowe nie działa",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub 3-cie aplikacje mogą nie działać. Dostęp do plików z zewnątrz i wysyłanie powiadomienia e-mail nie może również działać. Sugerujemy, aby włączyć połączenia internetowego dla tego serwera, jeśli chcesz mieć wszystkie opcje.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Ostatni cron był uruchomiony %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
+"Cron was not executed yet!" => "Cron nie został jeszcze uruchomiony!",
 "Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Użyj systemowego cron-a do uruchamiania cron.php raz na 15 minut.",
@@ -87,6 +116,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Wymuś HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
+"Email Server" => "Serwer pocztowy",
+"This is used for sending out notifications." => "To jest używane do wysyłania powiadomień",
+"From address" => "Z adresu",
+"Authentication required" => "Wymagana autoryzacja",
+"Server address" => "Adres Serwera",
+"Port" => "Port",
+"Credentials" => "Poświadczenia",
+"SMTP Username" => "Użytkownik SMTP",
+"SMTP Password" => "Hasło SMTP",
+"Test email settings" => "Ustawienia testowej wiadomości",
+"Send email" => "Wyślij email",
 "Log" => "Logi",
 "Log level" => "Poziom logów",
 "More" => "Więcej",
@@ -96,9 +136,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Dodaj swoją aplikację",
 "More Apps" => "Więcej aplikacji",
 "Select an App" => "Zaznacz aplikację",
+"Documentation:" => "Dokumentacja:",
 "See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
+"See application website" => "Zobacz na stronie aplikacji",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
-"User Documentation" => "Dokumentacja użytkownika",
 "Administrator Documentation" => "Dokumentacja administratora",
 "Online Documentation" => "Dokumentacja online",
 "Forum" => "Forum",
@@ -116,19 +157,20 @@ $TRANSLATIONS = array(
 "Full Name" => "Pełna nazwa",
 "Email" => "Email",
 "Your email address" => "Twój adres e-mail",
-"Fill in an email address to enable password recovery" => "Podaj adres e-mail, aby uzyskać możliwość odzyskania hasła",
+"Fill in an email address to enable password recovery and receive notifications" => "Wypełnij adres email aby włączyć odzyskiwanie hasła oraz otrzymywać powiadomienia",
 "Profile picture" => "Zdjęcie profilu",
 "Upload new" => "Wczytaj nowe",
 "Select new from Files" => "Wybierz nowe z plików",
 "Remove image" => "Usuń zdjęcie",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Png lub jpg. Idealnie kwadratowy, ale będzie można je przyciąć.",
-"Abort" => "Anuluj",
+"Your avatar is provided by your original account." => "Twój awatar jest ustawiony jako domyślny.",
+"Cancel" => "Anuluj",
 "Choose as profile image" => "Wybierz zdjęcie profilu",
 "Language" => "Język",
 "Help translate" => "Pomóż w tłumaczeniu",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Użyj tego adresu do <a href=\"%s\" target=\"_blank\">dostępu do twoich plików przez WebDAV</a>",
-"Encryption" => "Szyfrowanie",
+"The encryption app is no longer enabled, please decrypt all your files" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
 "Log-in password" => "Hasło logowania",
 "Decrypt all Files" => "Odszyfruj wszystkie pliki",
 "Login Name" => "Login",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 7577ea1d5f..dad6773d6a 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Valor inválido fornecido para %s",
+"Saved" => "Salvo",
+"test email settings" => "testar configurações de email",
+"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail, as configurações parecem estar corretas.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "Ocorreu um problema ao enviar o e-mail. Por favor, reveja suas configurações.",
+"Email sent" => "E-mail enviado",
+"You need to set your user email before being able to send test emails." => "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste.",
+"Send mode" => "Modo enviar",
+"Encryption" => "Criptografia",
+"Authentication method" => "Método de autenticação",
 "Unable to load list from App Store" => "Não foi possível carregar lista da App Store",
 "Authentication error" => "Erro de autenticação",
 "Your full name has been changed." => "Seu nome completo foi alterado.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....",
 "Unable to change password" => "Impossível modificar senha",
+"Sending..." => "Enviando...",
+"User Documentation" => "Documentação de Usuário",
+"Admin Documentation" => "Documentação de Administrador",
 "Update to {appversion}" => "Atualizar para {appversion}",
 "Disable" => "Desabilitar",
 "Enable" => "Habilitar",
@@ -34,8 +47,12 @@ $TRANSLATIONS = array(
 "Update" => "Atualizar",
 "Updated" => "Atualizado",
 "Select a profile picture" => "Selecione uma imagem para o perfil",
+"Very weak password" => "Senha muito fraca",
+"Weak password" => "Senha fraca",
+"So-so password" => "So-so senha",
+"Good password" => "Boa senha",
+"Strong password" => "Senha forte",
 "Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
-"Saving..." => "Salvando...",
 "deleted" => "excluído",
 "undo" => "desfazer",
 "Unable to remove user" => "Impossível remover usuário",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avisos, erros e problemas fatais",
 "Errors and fatal issues" => "Erros e problemas fatais",
 "Fatal issues only" => "Somente questões fatais",
+"None" => "Nada",
+"Login" => "Login",
+"Plain" => "Plano",
+"NT LAN Manager" => "Gerenciador NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Aviso de Segurança",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Você está acessando %s via HTTP. Sugerimos você configurar o servidor para exigir o uso de HTTPS em seu lugar.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Seu diretório de dados e seus arquivos são, provavelmente, acessíveis a partir da internet. O arquivo htaccess. não está funcionando. Nós sugerimos fortemente que você configure o seu servidor web de uma forma que o diretório de dados não esteja mais acessível ou mova o diretório de dados para fora do raiz do servidor.",
@@ -70,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "Sem conexão com a internet",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Último cron foi executado em %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Última cron foi executado em %s. Isso é, mais do que uma hora atrás, algo parece errado.",
+"Cron was not executed yet!" => "Cron não foi executado ainda!",
 "Execute one task with each page loaded" => "Execute uma tarefa com cada página carregada",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Use o sistema de serviço cron para chamar o arquivo cron.php a cada 15 minutos.",
@@ -90,6 +116,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forçar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL.",
+"Email Server" => "Servidor de Email",
+"This is used for sending out notifications." => "Isto é usado para o envio de notificações.",
+"From address" => "Do Endereço",
+"Authentication required" => "Autenticação é requerida",
+"Server address" => "Endereço do servidor",
+"Port" => "Porta",
+"Credentials" => "Credenciais",
+"SMTP Username" => "Nome do Usuário SMTP",
+"SMTP Password" => "Senha SMTP",
+"Test email settings" => "Configurações de e-mail de teste",
+"Send email" => "Enviar email",
 "Log" => "Registro",
 "Log level" => "Nível de registro",
 "More" => "Mais",
@@ -99,9 +136,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Adicione seu Aplicativo",
 "More Apps" => "Mais Apps",
 "Select an App" => "Selecione um Aplicativo",
+"Documentation:" => "Documentação:",
 "See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
+"See application website" => "Consulte o site aplicação",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
-"User Documentation" => "Documentação de Usuário",
 "Administrator Documentation" => "Documentação de Administrador",
 "Online Documentation" => "Documentação Online",
 "Forum" => "Fórum",
@@ -119,20 +157,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Nome Completo",
 "Email" => "E-mail",
 "Your email address" => "Seu endereço de e-mail",
-"Fill in an email address to enable password recovery" => "Preencha um endereço de e-mail para habilitar a recuperação de senha",
+"Fill in an email address to enable password recovery and receive notifications" => "Preencha com um e-mail para permitir a recuperação de senha e receber notificações",
 "Profile picture" => "Imagem para o perfil",
 "Upload new" => "Enviar nova foto",
 "Select new from Files" => "Selecinar uma nova dos Arquivos",
 "Remove image" => "Remover imagem",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la.",
 "Your avatar is provided by your original account." => "Seu avatar é fornecido por sua conta original.",
-"Abort" => "Abortar",
+"Cancel" => "Cancelar",
 "Choose as profile image" => "Escolha como imagem para o perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Use este endereço <a href=\"%s\" target=\"_blank\">para ter acesso a seus Arquivos via WebDAV</a>",
-"Encryption" => "Criptografia",
 "The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
 "Log-in password" => "Senha de login",
 "Decrypt all Files" => "Decripti todos os Arquivos",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 89bed08597..ee8a9217f5 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,5 +1,10 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Guardado",
+"test email settings" => "testar configurações de email",
+"Email sent" => "E-mail enviado",
+"Send mode" => "Modo de envio",
+"Encryption" => "Encriptação",
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
 "Authentication error" => "Erro na autenticação",
 "Your full name has been changed." => "O seu nome completo foi alterado.",
@@ -22,6 +27,8 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
 "Unable to change password" => "Não foi possível alterar a sua password",
+"Sending..." => "A enviar...",
+"User Documentation" => "Documentação de Utilizador",
 "Update to {appversion}" => "Actualizar para a versão {appversion}",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -35,7 +42,6 @@ $TRANSLATIONS = array(
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccione uma fotografia de perfil",
 "Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
-"Saving..." => "A guardar...",
 "deleted" => "apagado",
 "undo" => "desfazer",
 "Unable to remove user" => "Não foi possível remover o utilizador",
@@ -53,6 +59,10 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Avisos, erros e problemas fatais",
 "Errors and fatal issues" => "Erros e problemas fatais",
 "Fatal issues only" => "Apenas problemas fatais",
+"None" => "Nenhum",
+"Login" => "Login",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Aviso de Segurança",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está a aceder %s via HTTP. Recomendamos vivamente que configure o servidor para forçar o uso de 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." => "A sua pasta com os dados e os seus ficheiros estão provavelmente acessíveis a partir das internet. O seu ficheiro .htaccess não está a funcionar corretamente. Sugerimos veementemente que configure o seu servidor web de maneira a que a pasta com os dados deixe de ficar acessível, ou mova a pasta com os dados para fora da raiz de documentos do servidor web.",
@@ -90,6 +100,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forçar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forçar os clientes a ligar a %s através de uma ligação encriptada",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
+"Email Server" => "Servidor de email",
+"This is used for sending out notifications." => "Isto é utilizado para enviar notificações",
+"From address" => "Do endereço",
+"Authentication required" => "Autenticação necessária",
+"Server address" => "Endereço do servidor",
+"Port" => "Porto",
+"Credentials" => "Credenciais",
+"SMTP Username" => "Nome de utilizador SMTP",
+"SMTP Password" => "Password SMTP",
+"Test email settings" => "Testar configurações de email",
+"Send email" => "Enviar email",
 "Log" => "Registo",
 "Log level" => "Nível do registo",
 "More" => "Mais",
@@ -99,9 +120,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Adicione a sua aplicação",
 "More Apps" => "Mais Aplicações",
 "Select an App" => "Selecione uma aplicação",
+"Documentation:" => "Documentação:",
 "See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
+"See application website" => "Ver site da aplicação",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
-"User Documentation" => "Documentação de Utilizador",
 "Administrator Documentation" => "Documentação de administrador.",
 "Online Documentation" => "Documentação Online",
 "Forum" => "Fórum",
@@ -119,20 +141,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Nome completo",
 "Email" => "Email",
 "Your email address" => "O seu endereço de email",
-"Fill in an email address to enable password recovery" => "Preencha com o seu endereço de email para ativar a recuperação da palavra-chave",
 "Profile picture" => "Foto do perfil",
 "Upload new" => "Carregar novo",
 "Select new from Files" => "Seleccionar novo a partir dos ficheiros",
 "Remove image" => "Remover imagem",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Apenas png ou jpg. Idealmente quadrada, mas poderá corta-la depois.",
 "Your avatar is provided by your original account." => "O seu avatar é fornecido pela sua conta original.",
-"Abort" => "Abortar",
+"Cancel" => "Cancelar",
 "Choose as profile image" => "Escolha uma fotografia de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Utilize esta ligação para <a href=\"%s\" target=\"_blank\">aceder aos seus ficheiros via WebDAV</a>",
-"Encryption" => "Encriptação",
 "The encryption app is no longer enabled, please decrypt all your files" => "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
 "Log-in password" => "Password de entrada",
 "Decrypt all Files" => "Desencriptar todos os ficheiros",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 1433185430..6754ae2557 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Salvat",
+"Email sent" => "Mesajul a fost expediat",
+"Encryption" => "Încriptare",
 "Unable to load list from App Store" => "Imposibil de actualizat lista din  App Store.",
 "Authentication error" => "Eroare la autentificare",
 "Group already exists" => "Grupul există deja",
@@ -16,6 +19,7 @@ $TRANSLATIONS = array(
 "Couldn't update app." => "Aplicaţia nu s-a putut actualiza.",
 "Wrong password" => "Parolă greșită",
 "Unable to change password" => "Imposibil de schimbat parola",
+"User Documentation" => "Documentație utilizator",
 "Update to {appversion}" => "Actualizat la {versiuneaaplicaţiei}",
 "Disable" => "Dezactivați",
 "Enable" => "Activare",
@@ -25,7 +29,6 @@ $TRANSLATIONS = array(
 "Error" => "Eroare",
 "Update" => "Actualizare",
 "Updated" => "Actualizat",
-"Saving..." => "Se salvează...",
 "deleted" => "șters",
 "undo" => "Anulează ultima acțiune",
 "Unable to remove user" => "Imposibil de eliminat utilizatorul",
@@ -37,6 +40,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Eroare la crearea utilizatorului",
 "A valid password must be provided" => "Trebuie să furnizaţi o parolă validă",
 "__language_name__" => "_language_name_",
+"None" => "Niciuna",
+"Login" => "Autentificare",
 "Security Warning" => "Avertisment de securitate",
 "Setup Warning" => "Atenţie la implementare",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
@@ -57,6 +62,8 @@ $TRANSLATIONS = array(
 "Allow users to share with anyone" => "Permite utilizatorilor să partajeze cu oricine",
 "Allow users to only share with users in their groups" => "Permite utilizatorilor să partajeze doar cu utilizatori din același grup",
 "Security" => "Securitate",
+"Server address" => "Adresa server-ului",
+"Port" => "Portul",
 "Log" => "Jurnal de activitate",
 "Log level" => "Nivel jurnal",
 "More" => "Mai mult",
@@ -68,7 +75,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Selectează o aplicație",
 "See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>",
-"User Documentation" => "Documentație utilizator",
 "Administrator Documentation" => "Documentație administrator",
 "Online Documentation" => "Documentație online",
 "Forum" => "Forum",
@@ -84,14 +90,14 @@ $TRANSLATIONS = array(
 "Change password" => "Schimbă parola",
 "Email" => "Email",
 "Your email address" => "Adresa ta de email",
-"Fill in an email address to enable password recovery" => "Completează o adresă de mail pentru a-ți putea recupera parola",
 "Profile picture" => "Imagine de profil",
 "Remove image" => "Înlătură imagine",
+"Cancel" => "Anulare",
 "Choose as profile image" => "Alege drept imagine de profil",
 "Language" => "Limba",
 "Help translate" => "Ajută la traducere",
 "WebDAV" => "WebDAV",
-"Encryption" => "Încriptare",
+"Login Name" => "Autentificare",
 "Create" => "Crează",
 "Default Storage" => "Stocare implicită",
 "Unlimited" => "Nelimitată",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 8a9ae156f1..9cbdeee2c2 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Saved" => "Сохранено",
+"Email sent" => "Письмо отправлено",
+"Encryption" => "Шифрование",
 "Unable to load list from App Store" => "Не удалось загрузить список из App Store",
 "Authentication error" => "Ошибка аутентификации",
 "Your full name has been changed." => "Ваше полное имя было изменено.",
@@ -22,6 +25,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
 "Unable to change password" => "Невозможно изменить пароль",
+"User Documentation" => "Пользовательская документация",
 "Update to {appversion}" => "Обновить до {версия приложения}",
 "Disable" => "Выключить",
 "Enable" => "Включить",
@@ -34,8 +38,12 @@ $TRANSLATIONS = array(
 "Update" => "Обновить",
 "Updated" => "Обновлено",
 "Select a profile picture" => "Выберите картинку профиля",
+"Very weak password" => "Очень слабый пароль",
+"Weak password" => "Слабый пароль",
+"So-so password" => "Так себе пароль",
+"Good password" => "Хороший пароль",
+"Strong password" => "Устойчивый к взлому пароль",
 "Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
-"Saving..." => "Сохранение...",
 "deleted" => "удален",
 "undo" => "отмена",
 "Unable to remove user" => "Невозможно удалить пользователя",
@@ -53,6 +61,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Предупреждения, ошибки и критические проблемы",
 "Errors and fatal issues" => "Ошибки и критические проблемы",
 "Fatal issues only" => "Только критические проблемы",
+"None" => "Нет новостей",
+"Login" => "Логин",
 "Security Warning" => "Предупреждение безопасности",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Вы обращаетесь к %s используя HTTP. Мы настоятельно рекомендуем вам настроить сервер на использование 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." => "Похоже, что папка с Вашими данными и Ваши файлы доступны из интернета. Файл .htaccess не работает. Мы настойчиво предлагаем Вам сконфигурировать вебсервер таким образом, чтобы папка с Вашими данными более не была доступна или переместите папку с данными куда-нибудь в другое место вне основной папки документов вебсервера.",
@@ -90,6 +100,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Принудить к HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Принудить клиентов подключаться к %s через шифрованное соединение.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить принудительное SSL.",
+"Server address" => "Адрес сервера",
+"Port" => "Порт",
+"Credentials" => "Полномочия",
 "Log" => "Журнал",
 "Log level" => "Уровень детализации журнала",
 "More" => "Больше",
@@ -101,7 +114,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Выберите приложение",
 "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
-"User Documentation" => "Пользовательская документация",
 "Administrator Documentation" => "Документация администратора",
 "Online Documentation" => "Online документация",
 "Forum" => "Форум",
@@ -119,20 +131,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Полное имя",
 "Email" => "E-mail",
 "Your email address" => "Ваш адрес электронной почты",
-"Fill in an email address to enable password recovery" => "Введите адрес электронной почты, чтобы появилась возможность восстановления пароля",
 "Profile picture" => "Фото профиля",
 "Upload new" => "Загрузить новую",
 "Select new from Files" => "Выберите новый из файлов",
 "Remove image" => "Удалить изображение",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Либо png, либо jpg. Изображение должно быть квадратным, но вы сможете обрезать его позже.",
 "Your avatar is provided by your original account." => "Будет использован аватар вашей оригинальной учетной записи.",
-"Abort" => "Отмена",
+"Cancel" => "Отменить",
 "Choose as profile image" => "Выберите изображение профиля",
 "Language" => "Язык",
 "Help translate" => "Помочь с переводом",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Используйте этот адресс для <a href=\"%s\" target=\"_blank\">доступа к вашим файлам через WebDAV</a>",
-"Encryption" => "Шифрование",
 "The encryption app is no longer enabled, please decrypt all your files" => "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
 "Log-in password" => "Пароль входа",
 "Decrypt all Files" => "Снять шифрование со всех файлов",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 8c90d1c995..f9d912d180 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Encryption" => "ගුප්ත කේතනය",
 "Authentication error" => "සත්‍යාපන දෝෂයක්",
 "Group already exists" => "කණ්ඩායම දැනටමත් තිබේ",
 "Unable to add group" => "කාණඩයක් එක් කළ නොහැකි විය",
@@ -15,11 +16,12 @@ $TRANSLATIONS = array(
 "Enable" => "සක්‍රිය කරන්න",
 "Error" => "දෝෂයක්",
 "Update" => "යාවත්කාල කිරීම",
-"Saving..." => "සුරැකෙමින් පවතී...",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
 "Groups" => "කණ්ඩායම්",
 "Group Admin" => "කාණ්ඩ පරිපාලක",
 "Delete" => "මකා දමන්න",
+"None" => "කිසිවක් නැත",
+"Login" => "ප්‍රවිශ්ටය",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Sharing" => "හුවමාරු කිරීම",
 "Allow links" => "යොමු සලසන්න",
@@ -27,6 +29,8 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "හුවමාරු කළ  හුවමාරුවට අවසර දෙමි",
 "Allow users to share with anyone" => "ඕනෑම අයෙකු හා හුවමාරුවට අවසර දෙමි",
 "Allow users to only share with users in their groups" => "තම කණ්ඩායමේ අයෙකු හා පමණක් හුවමාරුවට අවසර දෙමි",
+"Server address" => "සේවාදායකයේ ලිපිනය",
+"Port" => "තොට",
 "Log" => "ලඝුව",
 "More" => "වැඩි",
 "Less" => "අඩු",
@@ -42,10 +46,10 @@ $TRANSLATIONS = array(
 "Change password" => "මුරපදය වෙනස් කිරීම",
 "Email" => "විද්‍යුත් තැපෑල",
 "Your email address" => "ඔබගේ විද්‍යුත් තැපෑල",
-"Fill in an email address to enable password recovery" => "මුරපද ප්‍රතිස්ථාපනය සඳහා විද්‍යුත් තැපැල් විස්තර ලබා දෙන්න",
+"Cancel" => "එපා",
 "Language" => "භාෂාව",
 "Help translate" => "පරිවර්ථන සහය",
-"Encryption" => "ගුප්ත කේතනය",
+"Login Name" => "ප්‍රවිශ්ටය",
 "Create" => "තනන්න",
 "Other" => "වෙනත්",
 "Username" => "පරිශීලක නම"
diff --git a/settings/l10n/sk.php b/settings/l10n/sk.php
index 6bde1c438e..ab3a1bf583 100644
--- a/settings/l10n/sk.php
+++ b/settings/l10n/sk.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Delete" => "Odstrániť",
+"Cancel" => "Zrušiť",
 "Other" => "Ostatné"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index fc3fe54075..eaa8552f9c 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email odoslaný",
+"Encryption" => "Šifrovanie",
 "Unable to load list from App Store" => "Nie je možné nahrať zoznam z App Store",
 "Authentication error" => "Chyba autentifikácie",
 "Your full name has been changed." => "Vaše meno a priezvisko bolo zmenené.",
@@ -22,11 +24,12 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.",
 "Unable to change password" => "Zmena hesla sa nepodarila",
+"User Documentation" => "Príručka používateľa",
 "Update to {appversion}" => "Aktualizovať na {appversion}",
 "Disable" => "Zakázať",
 "Enable" => "Zapnúť",
 "Please wait...." => "Čakajte prosím...",
-"Error while disabling app" => "Chyba pri zablokovaní aplikácie",
+"Error while disabling app" => "Chyba pri zakázaní aplikácie",
 "Error while enabling app" => "Chyba pri povoľovaní aplikácie",
 "Updating...." => "Aktualizujem...",
 "Error while updating app" => "chyba pri aktualizácii aplikácie",
@@ -35,7 +38,6 @@ $TRANSLATIONS = array(
 "Updated" => "Aktualizované",
 "Select a profile picture" => "Vybrať avatara",
 "Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
-"Saving..." => "Ukladám...",
 "deleted" => "zmazané",
 "undo" => "vrátiť",
 "Unable to remove user" => "Nemožno odobrať používateľa",
@@ -53,6 +55,8 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Upozornenia, chyby a fatálne problémy",
 "Errors and fatal issues" => "Chyby a fatálne problémy",
 "Fatal issues only" => "Len fatálne problémy",
+"None" => "Žiadny",
+"Login" => "Prihlásenie",
 "Security Warning" => "Bezpečnostné upozornenie",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Do %s máte prístup cez HTTP. Dôrazne odporúčame nakonfigurovať server tak, aby namiesto toho vyžadoval použitie 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áš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný, alebo presunúť priečinok s dátami mimo priestor sprístupňovaný webovým serverom.",
@@ -62,7 +66,7 @@ $TRANSLATIONS = array(
 "Module 'fileinfo' missing" => "Chýba modul 'fileinfo'",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
 "Your PHP version is outdated" => "Vaša PHP verzia je zastaraná",
-"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." => "Táto verzia PHP je zastaraná. Dôrazne vám odporúčame aktualizovať na verziu 5.3.8 alebo novšiu, lebo staršie verzie sú chybné. Je možné, že táto instalácia nebude fungovat správne.",
+"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." => "Táto verzia PHP je zastaraná. Dôrazne vám odporúčame aktualizovať na verziu 5.3.8 alebo novšiu, lebo staršie verzie sú chybné. Je možné, že táto inštalácia nebude fungovať správne.",
 "Locale not working" => "Lokalizácia nefunguje",
 "System locale can not be set to a one which supports UTF-8." => "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.",
 "This means that there might be problems with certain characters in file names." => "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.",
@@ -84,12 +88,15 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Povoliť používateľom ďalej zdieľať zdieľané položky",
 "Allow users to share with anyone" => "Povoliť používateľom zdieľať s kýmkoľvek",
 "Allow users to only share with users in their groups" => "Povoliť používateľom zdieľať len s používateľmi v ich skupinách",
-"Allow mail notification" => "Povoliť upozornenia emailom",
-"Allow user to send mail notification for shared files" => "Povoliť používateľom upozornenia emailom pre svoje zdieľané súbory",
+"Allow mail notification" => "Povoliť odosielať upozornenia emailom",
+"Allow user to send mail notification for shared files" => "Povoliť používateľom odosielať upozornenia emailom pre svoje zdieľané súbory",
 "Security" => "Zabezpečenie",
 "Enforce HTTPS" => "Vynútiť HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
+"Server address" => "Adresa servera",
+"Port" => "Port",
+"Credentials" => "Prihlasovanie údaje",
 "Log" => "Záznam",
 "Log level" => "Úroveň záznamu",
 "More" => "Viac",
@@ -101,7 +108,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Vyberte aplikáciu",
 "See application page at apps.owncloud.com" => "Pozrite si stránku aplikácií na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
-"User Documentation" => "Príručka používateľa",
 "Administrator Documentation" => "Príručka administrátora",
 "Online Documentation" => "Online príručka",
 "Forum" => "Fórum",
@@ -111,7 +117,7 @@ $TRANSLATIONS = array(
 "Show First Run Wizard again" => "Znovu zobraziť sprievodcu prvým spustením",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
 "Password" => "Heslo",
-"Your password was changed" => "Heslo bolo zmenené",
+"Your password was changed" => "Vaše heslo bolo zmenené",
 "Unable to change your password" => "Nie je možné zmeniť vaše heslo",
 "Current password" => "Aktuálne heslo",
 "New password" => "Nové heslo",
@@ -119,20 +125,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Meno a priezvisko",
 "Email" => "Email",
 "Your email address" => "Vaša emailová adresa",
-"Fill in an email address to enable password recovery" => "Vyplňte emailovú adresu pre aktivovanie obnovy hesla",
 "Profile picture" => "Avatar",
 "Upload new" => "Nahrať nový",
 "Select new from Files" => "Vyberte nový zo súborov",
 "Remove image" => "Zmazať obrázok",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Buď png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať.",
-"Your avatar is provided by your original account." => "Váš avatar je použiý z pôvodného účtu.",
-"Abort" => "Prerušiť",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Formát súboru png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať.",
+"Your avatar is provided by your original account." => "Váš avatar je použitý z pôvodného účtu.",
+"Cancel" => "Zrušiť",
 "Choose as profile image" => "Vybrať ako avatara",
 "Language" => "Jazyk",
 "Help translate" => "Pomôcť s prekladom",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Použite túto linku <a href=\"%s\" target=\"_blank\">pre prístup k vašim súborom cez WebDAV</a>",
-"Encryption" => "Šifrovanie",
 "The encryption app is no longer enabled, please decrypt all your files" => "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory.",
 "Log-in password" => "Prihlasovacie heslo",
 "Decrypt all Files" => "Dešifrovať všetky súbory",
@@ -144,7 +148,7 @@ $TRANSLATIONS = array(
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Prosím zadajte kvótu úložného priestoru (napr.: \"512 MB​​\" alebo \"12 GB\")",
 "Unlimited" => "Nelimitované",
 "Other" => "Iné",
-"Username" => "Meno používateľa",
+"Username" => "Používateľské meno",
 "Storage" => "Úložisko",
 "change full name" => "zmeniť meno a priezvisko",
 "set new password" => "nastaviť nové heslo",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 0bd4ef50fe..414f46712e 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,5 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "Navedena je napačna vrednost za %s",
+"Saved" => "Shranjeno",
+"Email sent" => "Elektronska pošta je poslana",
+"Send mode" => "Način pošiljanja",
+"Encryption" => "Šifriranje",
+"Authentication method" => "Način overitve",
 "Unable to load list from App Store" => "Ni mogoče naložiti seznama iz programskega središča",
 "Authentication error" => "Napaka med overjanjem",
 "Your full name has been changed." => "Vaše polno ime je spremenjeno.",
@@ -22,6 +28,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.",
 "Unable to change password" => "Ni mogoče spremeniti gesla",
+"Sending..." => "Poteka pošiljanje ...",
+"User Documentation" => "Uporabniška dokumentacija",
+"Admin Documentation" => "Skrbniška dokumentacija",
 "Update to {appversion}" => "Posodobi na {appversion}",
 "Disable" => "Onemogoči",
 "Enable" => "Omogoči",
@@ -34,8 +43,12 @@ $TRANSLATIONS = array(
 "Update" => "Posodobi",
 "Updated" => "Posodobljeno",
 "Select a profile picture" => "Izbor slike profila",
+"Very weak password" => "Zelo šibko geslo",
+"Weak password" => "Šibko geslo",
+"So-so password" => "Slabo geslo",
+"Good password" => "Dobro geslo",
+"Strong password" => "Odlično geslo",
 "Decrypting files... Please wait, this can take some time." => "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
-"Saving..." => "Poteka shranjevanje ...",
 "deleted" => "izbrisano",
 "undo" => "razveljavi",
 "Unable to remove user" => "Uporabnika ni mogoče odstraniti",
@@ -53,6 +66,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Opozorila, napake in usodne dogodke",
 "Errors and fatal issues" => "Napake in usodne dogodke",
 "Fatal issues only" => "Le usodne dogodke",
+"None" => "Brez",
+"Login" => "Prijava",
+"Plain" => "Besedilno",
+"NT LAN Manager" => "Upravljalnik NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Varnostno opozorilo",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Dostop do %s poteka preko HTTP. Priporočljivo je nastaviti strežnik na privzeto uporabo varne povezave preko protokola 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." => "Vaša podatkovna mapa in datoteke so najverjetneje dosegljive preko interneta. Datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da podatkovna mapa ni prosto dostopna. To je mogoče zagotoviti tudi tako, da je mapa premaknjena iz neustrezne korenske v podrejeno mapo .",
@@ -90,6 +109,15 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Zahtevaj uporabo HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
+"Email Server" => "Poštni strežnik",
+"Authentication required" => "Zahtevana je overitev",
+"Server address" => "Naslov strežnika",
+"Port" => "Vrata",
+"Credentials" => "Poverila",
+"SMTP Username" => "Uporabniško ime SMTP",
+"SMTP Password" => "Geslo SMTP",
+"Test email settings" => "Preizkus nastavitev elektronske pošte",
+"Send email" => "Pošlji elektronsko sporočilo",
 "Log" => "Dnevnik",
 "Log level" => "Raven beleženja",
 "More" => "Več",
@@ -99,9 +127,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Dodaj program",
 "More Apps" => "Več programov",
 "Select an App" => "Izbor programa",
+"Documentation:" => "Dokumentacija:",
 "See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com",
+"See application website" => "Oglejte si spletno stran programa",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>",
-"User Documentation" => "Uporabniška dokumentacija",
 "Administrator Documentation" => "Skrbniška dokumentacija",
 "Online Documentation" => "Spletna dokumentacija",
 "Forum" => "Forum",
@@ -119,20 +148,18 @@ $TRANSLATIONS = array(
 "Full Name" => "Polno ime",
 "Email" => "Elektronski naslov",
 "Your email address" => "Osebni elektronski naslov",
-"Fill in an email address to enable password recovery" => "Vpišite osebni elektronski naslov in s tem omogočite obnovitev gesla",
 "Profile picture" => "Slika profila",
 "Upload new" => "Pošlji novo",
 "Select new from Files" => "Izberi novo iz menija datotek",
 "Remove image" => "Odstrani sliko",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Slika je lahko png ali jpg. Slika naj bo kvadratna, ni pa to pogoj, saj  jo bo mogoče obrezati.",
 "Your avatar is provided by your original account." => "Podoba je podana v izvornem računu.",
-"Abort" => "Prekini",
+"Cancel" => "Prekliči",
 "Choose as profile image" => "Izberi kot sliko profila",
 "Language" => "Jezik",
 "Help translate" => "Sodelujte pri prevajanju",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Uporabite naslov <a href=\"%s\" target=\"_blank\"> za dostop do datotek rpeko sistema WebDAV</a>.",
-"Encryption" => "Šifriranje",
 "The encryption app is no longer enabled, please decrypt all your files" => "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
 "Log-in password" => "Prijavno geslo",
 "Decrypt all Files" => "Odšifriraj vse datoteke",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 4bb2576a88..29925683c0 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email-i u dërgua",
 "Unable to load list from App Store" => "E pamundur të shkarkohet lista nga App Store",
 "Authentication error" => "Gabim autentifikimi",
 "Group already exists" => "Grupi ekziston",
@@ -14,6 +15,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "E pamundur t'i shtohet përdoruesi grupit %s",
 "Unable to remove user from group %s" => "E pamundur të hiqet përdoruesi nga grupi %s",
 "Couldn't update app." => "E pamundur të përditësohet app.",
+"User Documentation" => "Dokumentacion përdoruesi",
 "Update to {appversion}" => "Përditësim për {appversion}",
 "Disable" => "Çaktivizo",
 "Enable" => "Aktivizo",
@@ -23,7 +25,6 @@ $TRANSLATIONS = array(
 "Error" => "Gabim",
 "Update" => "Përditësim",
 "Updated" => "I përditësuar",
-"Saving..." => "Duke ruajtur...",
 "deleted" => "fshirë",
 "undo" => "anullo veprimin",
 "Unable to remove user" => "E pamundur të fshiet përdoruesi",
@@ -57,9 +58,11 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Lejoni përdoruesit të ndajnë vetëm me përdorues të të njëjtit grup",
 "Security" => "Siguria",
 "Enforce HTTPS" => "Detyro HTTPS",
+"Port" => "Porta",
 "Log" => "Historik aktiviteti",
 "Log level" => "Niveli i Historikut",
 "More" => "Më tepër",
+"Less" => "M'pak",
 "Version" => "Versioni",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Zhvilluar nga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Komuniteti OwnCloud</a>, gjithashtu <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> është licensuar me anë të <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Shtoni apliakcionin tuaj",
@@ -67,7 +70,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Zgjidhni një Aplikacion",
 "See application page at apps.owncloud.com" => "Shihni faqen e aplikacionit tek apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensuar nga <span class=\"author\"></span>",
-"User Documentation" => "Dokumentacion përdoruesi",
 "Administrator Documentation" => "Dokumentacion administratori",
 "Online Documentation" => "Dokumentacion online",
 "Forum" => "Forumi",
@@ -84,7 +86,7 @@ $TRANSLATIONS = array(
 "Change password" => "Ndrysho fjalëkalimin",
 "Email" => "Email",
 "Your email address" => "Adresa juaj email",
-"Fill in an email address to enable password recovery" => "Jepni një adresë email për të aktivizuar rigjetjen e fjalëkalimit",
+"Cancel" => "Anullo",
 "Language" => "Gjuha",
 "Help translate" => "Ndihmoni në përkthim",
 "WebDAV" => "WebDAV",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index b521ad7ce5..3723ef3fe5 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Порука је послата",
+"Encryption" => "Шифровање",
 "Unable to load list from App Store" => "Грешка приликом учитавања списка из Складишта Програма",
 "Authentication error" => "Грешка при провери идентитета",
 "Group already exists" => "Група већ постоји",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Не могу да додам корисника у групу %s",
 "Unable to remove user from group %s" => "Не могу да уклоним корисника из групе %s",
 "Couldn't update app." => "Не могу да ажурирам апликацију.",
+"User Documentation" => "Корисничка документација",
 "Update to {appversion}" => "Ажурирај на {appversion}",
 "Disable" => "Искључи",
 "Enable" => "Омогући",
@@ -23,7 +26,6 @@ $TRANSLATIONS = array(
 "Error" => "Грешка",
 "Update" => "Ажурирај",
 "Updated" => "Ажурирано",
-"Saving..." => "Чување у току...",
 "deleted" => "обрисано",
 "undo" => "опозови",
 "Unable to remove user" => "Не могу да уклоним корисника",
@@ -35,6 +37,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Грешка при прављењу корисника",
 "A valid password must be provided" => "Морате унети исправну лозинку",
 "__language_name__" => "__language_name__",
+"None" => "Ништа",
+"Login" => "Пријави ме",
 "Security Warning" => "Сигурносно упозорење",
 "Setup Warning" => "Упозорење о подешавању",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно.",
@@ -54,6 +58,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Дозволи корисницима да деле само са корисницима у њиховим групама",
 "Security" => "Безбедност",
 "Enforce HTTPS" => "Наметни HTTPS",
+"Server address" => "Адреса сервера",
+"Port" => "Порт",
 "Log" => "Бележење",
 "Log level" => "Ниво бележења",
 "More" => "Више",
@@ -65,7 +71,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Изаберите програм",
 "See application page at apps.owncloud.com" => "Погледајте страницу са програмима на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>",
-"User Documentation" => "Корисничка документација",
 "Administrator Documentation" => "Администраторска документација",
 "Online Documentation" => "Мрежна документација",
 "Forum" => "Форум",
@@ -82,11 +87,10 @@ $TRANSLATIONS = array(
 "Change password" => "Измени лозинку",
 "Email" => "Е-пошта",
 "Your email address" => "Ваша адреса е-поште",
-"Fill in an email address to enable password recovery" => "Ун",
+"Cancel" => "Откажи",
 "Language" => "Језик",
 "Help translate" => " Помозите у превођењу",
 "WebDAV" => "WebDAV",
-"Encryption" => "Шифровање",
 "Login Name" => "Корисничко име",
 "Create" => "Направи",
 "Default Storage" => "Подразумевано складиште",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index b89f710c28..2ca3f37e10 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email poslat",
 "Authentication error" => "Greška pri autentifikaciji",
 "Language changed" => "Jezik je izmenjen",
 "Invalid request" => "Neispravan zahtev",
@@ -14,6 +15,7 @@ $TRANSLATIONS = array(
 "New password" => "Nova lozinka",
 "Change password" => "Izmeni lozinku",
 "Email" => "E-mail",
+"Cancel" => "Otkaži",
 "Language" => "Jezik",
 "Create" => "Napravi",
 "Other" => "Drugo",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 9f83a18373..43695d8b28 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "E-post skickat",
+"Encryption" => "Kryptering",
 "Unable to load list from App Store" => "Kan inte ladda listan från App Store",
 "Authentication error" => "Fel vid autentisering",
 "Unable to change full name" => "Kunde inte ändra hela namnet",
@@ -21,6 +23,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.",
 "Unable to change password" => "Kunde inte ändra lösenord",
+"User Documentation" => "Användardokumentation",
 "Update to {appversion}" => "Uppdatera till {appversion}",
 "Disable" => "Deaktivera",
 "Enable" => "Aktivera",
@@ -34,7 +37,6 @@ $TRANSLATIONS = array(
 "Updated" => "Uppdaterad",
 "Select a profile picture" => "Välj en profilbild",
 "Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
-"Saving..." => "Sparar...",
 "deleted" => "raderad",
 "undo" => "ångra",
 "Unable to remove user" => "Kan inte ta bort användare",
@@ -47,6 +49,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Ett giltigt lösenord måste anges",
 "Warning: Home directory for user \"{user}\" already exists" => "Varning: Hem katalogen för varje användare \"{användare}\" finns redan",
 "__language_name__" => "__language_name__",
+"None" => "Ingen",
+"Login" => "Logga in",
 "Security Warning" => "Säkerhetsvarning",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din datakatalog och dina filer är förmodligen åtkomliga från internet. Filen .htaccess fungerar inte. Vi rekommenderar starkt att du konfigurerar din webbserver så att datakatalogen inte längre är åtkomlig eller du flyttar datakatalogen utanför webbserverns rotkatalog.",
 "Setup Warning" => "Installationsvarning",
@@ -78,6 +82,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Kräv HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL",
+"Server address" => "Serveradress",
+"Port" => "Port",
+"Credentials" => "Inloggningsuppgifter",
 "Log" => "Logg",
 "Log level" => "Nivå på loggning",
 "More" => "Mer",
@@ -89,7 +96,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Välj en App",
 "See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
-"User Documentation" => "Användardokumentation",
 "Administrator Documentation" => "Administratörsdokumentation",
 "Online Documentation" => "Onlinedokumentation",
 "Forum" => "Forum",
@@ -107,19 +113,17 @@ $TRANSLATIONS = array(
 "Full Name" => "Hela namnet",
 "Email" => "E-post",
 "Your email address" => "Din e-postadress",
-"Fill in an email address to enable password recovery" => "Fyll i en e-postadress för att aktivera återställning av lösenord",
 "Profile picture" => "Profilbild",
 "Upload new" => "Ladda upp ny",
 "Select new from Files" => "Välj ny från filer",
 "Remove image" => "Radera bild",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Antingen png eller jpg. Helst fyrkantig, men du kommer att kunna beskära den.",
-"Abort" => "Avbryt",
+"Cancel" => "Avbryt",
 "Choose as profile image" => "Välj som profilbild",
 "Language" => "Språk",
 "Help translate" => "Hjälp att översätta",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Använd denna adress till <a href=\"%s\" target=\"_blank\">nå dina Filer via WebDAV</a>",
-"Encryption" => "Kryptering",
 "Log-in password" => "Inloggningslösenord",
 "Decrypt all Files" => "Dekryptera alla filer",
 "Login Name" => "Inloggningsnamn",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index bfb6cace99..1ce8e5b41d 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Encryption" => "மறைக்குறியீடு",
 "Unable to load list from App Store" => "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது",
 "Authentication error" => "அத்தாட்சிப்படுத்தலில் வழு",
 "Group already exists" => "குழு ஏற்கனவே உள்ளது",
@@ -16,13 +17,17 @@ $TRANSLATIONS = array(
 "Enable" => "இயலுமைப்படுத்துக",
 "Error" => "வழு",
 "Update" => "இற்றைப்படுத்தல்",
-"Saving..." => "சேமிக்கப்படுகிறது...",
 "undo" => "முன் செயல் நீக்கம் ",
 "Groups" => "குழுக்கள்",
 "Group Admin" => "குழு நிர்வாகி",
 "Delete" => "நீக்குக",
 "__language_name__" => "_மொழி_பெயர்_",
+"None" => "ஒன்றுமில்லை",
+"Login" => "புகுபதிகை",
 "Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
+"Server address" => "சேவையக முகவரி",
+"Port" => "துறை ",
+"Credentials" => "சான்று ஆவணங்கள்",
 "More" => "மேலதிக",
 "Less" => "குறைவான",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
@@ -40,10 +45,10 @@ $TRANSLATIONS = array(
 "Change password" => "கடவுச்சொல்லை மாற்றுக",
 "Email" => "மின்னஞ்சல்",
 "Your email address" => "உங்களுடைய மின்னஞ்சல் முகவரி",
-"Fill in an email address to enable password recovery" => "கடவுச்சொல் மீள் பெறுவதை இயலுமைப்படுத்துவதற்கு மின்னஞ்சல் முகவரியை இயலுமைப்படுத்துக",
+"Cancel" => "இரத்து செய்க",
 "Language" => "மொழி",
 "Help translate" => "மொழிபெயர்க்க உதவி",
-"Encryption" => "மறைக்குறியீடு",
+"Login Name" => "புகுபதிகை",
 "Create" => "உருவாக்குக",
 "Other" => "மற்றவை",
 "Username" => "பயனாளர் பெயர்"
diff --git a/settings/l10n/te.php b/settings/l10n/te.php
index 21caa79912..5161863f13 100644
--- a/settings/l10n/te.php
+++ b/settings/l10n/te.php
@@ -2,11 +2,13 @@
 $TRANSLATIONS = array(
 "Error" => "పొరపాటు",
 "Delete" => "తొలగించు",
+"Server address" => "సేవకి చిరునామా",
 "More" => "మరిన్ని",
 "Password" => "సంకేతపదం",
 "New password" => "కొత్త సంకేతపదం",
 "Email" => "ఈమెయిలు",
 "Your email address" => "మీ ఈమెయిలు చిరునామా",
+"Cancel" => "రద్దుచేయి",
 "Language" => "భాష",
 "Username" => "వాడుకరి పేరు"
 );
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 60e53da323..14000c59ca 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "ส่งอีเมล์แล้ว",
+"Encryption" => "การเข้ารหัส",
 "Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
 "Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
 "Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
 "Unable to remove user from group %s" => "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้",
 "Couldn't update app." => "ไม่สามารถอัพเดทแอปฯ",
+"User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
 "Update to {appversion}" => "อัพเดทไปเป็นรุ่น {appversion}",
 "Disable" => "ปิดใช้งาน",
 "Enable" => "เปิดใช้งาน",
@@ -23,13 +26,14 @@ $TRANSLATIONS = array(
 "Error" => "ข้อผิดพลาด",
 "Update" => "อัพเดท",
 "Updated" => "อัพเดทแล้ว",
-"Saving..." => "กำลังบันทึกข้อมูล...",
 "deleted" => "ลบแล้ว",
 "undo" => "เลิกทำ",
 "Groups" => "กลุ่ม",
 "Group Admin" => "ผู้ดูแลกลุ่ม",
 "Delete" => "ลบ",
 "__language_name__" => "ภาษาไทย",
+"None" => "ไม่มี",
+"Login" => "เข้าสู่ระบบ",
 "Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
@@ -42,6 +46,9 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น",
 "Allow users to share with anyone" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้",
 "Allow users to only share with users in their groups" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น",
+"Server address" => "ที่อยู่เซิร์ฟเวอร์",
+"Port" => "พอร์ต",
+"Credentials" => "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
 "Log" => "บันทึกการเปลี่ยนแปลง",
 "Log level" => "ระดับการเก็บบันทึก log",
 "More" => "มาก",
@@ -53,7 +60,6 @@ $TRANSLATIONS = array(
 "Select an App" => "เลือก App",
 "See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>",
-"User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
 "Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
 "Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์",
 "Forum" => "กระดานสนทนา",
@@ -69,12 +75,11 @@ $TRANSLATIONS = array(
 "Change password" => "เปลี่ยนรหัสผ่าน",
 "Email" => "อีเมล",
 "Your email address" => "ที่อยู่อีเมล์ของคุณ",
-"Fill in an email address to enable password recovery" => "กรอกที่อยู่อีเมล์ของคุณเพื่อเปิดให้มีการกู้คืนรหัสผ่านได้",
 "Profile picture" => "รูปภาพโปรไฟล์",
+"Cancel" => "ยกเลิก",
 "Language" => "ภาษา",
 "Help translate" => "ช่วยกันแปล",
 "WebDAV" => "WebDAV",
-"Encryption" => "การเข้ารหัส",
 "Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
 "Create" => "สร้าง",
 "Default Storage" => "พื้นที่จำกัดข้อมูลเริ่มต้น",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 211b87d79d..68b464a5cc 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,5 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid value supplied for %s" => "%s için geçersiz değer sağlandı",
+"Saved" => "Kaydedildi",
+"test email settings" => "e-posta ayarlarını sına",
+"If you received this email, the settings seem to be correct." => "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.",
+"A problem occurred while sending the e-mail. Please revisit your settings." => "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınızı tekrar ziyaret edin.",
+"Email sent" => "E-posta gönderildi",
+"You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.",
+"Send mode" => "Gönderme kipi",
+"Encryption" => "Şifreleme",
+"Authentication method" => "Kimlik doğrulama yöntemi",
 "Unable to load list from App Store" => "App Store'dan liste yüklenemiyor",
 "Authentication error" => "Kimlik doğrulama hatası",
 "Your full name has been changed." => "Tam adınız değiştirildi.",
@@ -12,7 +22,7 @@ $TRANSLATIONS = array(
 "Unable to delete user" => "Kullanıcı silinemiyor",
 "Language changed" => "Dil değiştirildi",
 "Invalid request" => "Geçersiz istek",
-"Admins can't remove themself from the admin group" => "Yöneticiler kendilerini yönetici grubundan kaldıramaz",
+"Admins can't remove themself from the admin group" => "Yöneticiler kendilerini admin grubundan kaldıramaz",
 "Unable to add user to group %s" => "Kullanıcı %s grubuna eklenemiyor",
 "Unable to remove user from group %s" => "%s grubundan kullanıcı kaldırılamıyor",
 "Couldn't update app." => "Uygulama güncellenemedi.",
@@ -22,6 +32,9 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
 "Unable to change password" => "Parola değiştirilemiyor",
+"Sending..." => "Gönderiliyor...",
+"User Documentation" => "Kullanıcı Belgelendirmesi",
+"Admin Documentation" => "Yönetici Belgelendirmesi",
 "Update to {appversion}" => "{appversion} Güncelle",
 "Disable" => "Devre dışı bırak",
 "Enable" => "Etkinleştir",
@@ -34,13 +47,17 @@ $TRANSLATIONS = array(
 "Update" => "Güncelleme",
 "Updated" => "Güncellendi",
 "Select a profile picture" => "Bir profil fotoğrafı seçin",
+"Very weak password" => "Çok güçsüz parola",
+"Weak password" => "Güçsüz parola",
+"So-so password" => "Normal parola",
+"Good password" => "İyi parola",
+"Strong password" => "Güçlü parola",
 "Decrypting files... Please wait, this can take some time." => "Dosyaların şifresi çözülüyor... Lütfen bekleyin, bu biraz zaman alabilir.",
-"Saving..." => "Kaydediliyor...",
-"deleted" => "silindi",
+"deleted" => "silinen:",
 "undo" => "geri al",
 "Unable to remove user" => "Kullanıcı kaldırılamıyor",
 "Groups" => "Gruplar",
-"Group Admin" => "Yönetici Grubu ",
+"Group Admin" => "Grup Yöneticisi",
 "Delete" => "Sil",
 "add group" => "grup ekle",
 "A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
@@ -53,6 +70,12 @@ $TRANSLATIONS = array(
 "Warnings, errors and fatal issues" => "Uyarılar, hatalar ve ölümcül konular",
 "Errors and fatal issues" => "Hatalar ve ölümcül konular",
 "Fatal issues only" => "Sadece ölümcül konular",
+"None" => "Hiçbiri",
+"Login" => "Oturum Aç",
+"Plain" => "Düz",
+"NT LAN Manager" => "NT Ağ Yöneticisi",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Güvenlik Uyarısı",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s konumuna HTTP aracılığıyla erişiyorsunuz. Sunucunuzu HTTPS kullanımını zorlaması üzere yapılandırmanızı şiddetle öneririz.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. .htaccess  dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz.",
@@ -70,6 +93,9 @@ $TRANSLATIONS = array(
 "Internet connection not working" => "İnternet bağlantısı çalışmıyor",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacak demektir. Uzak dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Son cron %s zamanında çalıştırıldı.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
+"Cron was not executed yet!" => "Cron henüz çalıştırılmadı!",
 "Execute one task with each page loaded" => "Yüklenen her sayfa ile bir görev çalıştır",
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php, http üzerinden her 15 dakikada bir çağrılması için webcron hizmetine kaydedilir.",
 "Use systems cron service to call the cron.php file every 15 minutes." => "Cron.php dosyasını her 15 dakikada bir çağırmak için sistem cron hizmetini kullan.",
@@ -90,6 +116,17 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "HTTPS bağlantısına zorla",
 "Forces the clients to connect to %s via an encrypted connection." => "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen ,%s'a HTTPS ile bağlanın.",
+"Email Server" => "E-Posta Sunucusu",
+"This is used for sending out notifications." => "Bu, bildirimler gönderilirken kullanılır.",
+"From address" => "Kimden adresi",
+"Authentication required" => "Kimlik doğrulama gerekli",
+"Server address" => "Sunucu adresi",
+"Port" => "Port",
+"Credentials" => "Kimlik Bilgileri",
+"SMTP Username" => "SMTP Kullanıcı Adı",
+"SMTP Password" => "SMTP Parolası",
+"Test email settings" => "E-posta ayarlarını sına",
+"Send email" => "E-posta gönder",
 "Log" => "Günlük",
 "Log level" => "Günlük seviyesi",
 "More" => "Daha fazla",
@@ -99,9 +136,10 @@ $TRANSLATIONS = array(
 "Add your App" => "Uygulamanızı Ekleyin",
 "More Apps" => "Daha Fazla Uygulama",
 "Select an App" => "Bir Uygulama Seçin",
+"Documentation:" => "Belgelendirme:",
 "See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
+"See application website" => "Uygulama web sitesine bakın",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisanslayan <span class=\"author\"></span>",
-"User Documentation" => "Kullanıcı Belgelendirmesi",
 "Administrator Documentation" => "Yönetici Belgelendirmesi",
 "Online Documentation" => "Çevrimiçi Belgelendirme",
 "Forum" => "Forum",
@@ -119,20 +157,19 @@ $TRANSLATIONS = array(
 "Full Name" => "Tam Adı",
 "Email" => "E-posta",
 "Your email address" => "E-posta adresiniz",
-"Fill in an email address to enable password recovery" => "Parola kurtarmayı etkinleştirmek için bir e-posta adresi girin",
+"Fill in an email address to enable password recovery and receive notifications" => "Parola kurtarmayı ve bildirim almayı açmak için bir e-posta adresi girin",
 "Profile picture" => "Profil resmi",
 "Upload new" => "Yeni yükle",
 "Select new from Files" => "Dosyalardan seç",
 "Remove image" => "Resmi kaldır",
 "Either png or jpg. Ideally square but you will be able to crop it." => "PNG veya JPG. Genellikle karedir ancak kesebileceksiniz.",
 "Your avatar is provided by your original account." => "Görüntü resminiz, özgün hesabınız tarafından sağlanıyor.",
-"Abort" => "İptal Et",
+"Cancel" => "İptal",
 "Choose as profile image" => "Profil resmi olarak seç",
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "<a href=\"%s\" target=\"_blank\">Dosyalarınıza WebDAV aracılığıyla erişmek için</a> bu adresi kullanın",
-"Encryption" => "Şifreleme",
 "The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, tüm dosyalarınızın şifrelemesini kaldırın",
 "Log-in password" => "Oturum açma parolası",
 "Decrypt all Files" => "Tüm dosyaların şifresini çöz",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index e0e5e74005..c55834f733 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Encryption" => "شىفىرلاش",
 "Unable to load list from App Store" => "ئەپ بازىرىدىن تىزىمنى يۈكلىيەلمىدى",
 "Authentication error" => "سالاھىيەت دەلىللەش خاتالىقى",
 "Group already exists" => "گۇرۇپپا مەۋجۇت",
@@ -14,6 +15,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىغا قوشالمايدۇ",
 "Unable to remove user from group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەلمەيدۇ",
 "Couldn't update app." => "ئەپنى يېڭىلىيالمايدۇ.",
+"User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
 "Update to {appversion}" => "{appversion} غا يېڭىلايدۇ",
 "Disable" => "چەكلە",
 "Enable" => "قوزغات",
@@ -23,7 +25,6 @@ $TRANSLATIONS = array(
 "Error" => "خاتالىق",
 "Update" => "يېڭىلا",
 "Updated" => "يېڭىلاندى",
-"Saving..." => "ساقلاۋاتىدۇ…",
 "deleted" => "ئۆچۈرۈلگەن",
 "undo" => "يېنىۋال",
 "Unable to remove user" => "ئىشلەتكۈچىنى چىقىرىۋېتەلمەيدۇ",
@@ -35,12 +36,16 @@ $TRANSLATIONS = array(
 "Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
 "A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
 "__language_name__" => "ئۇيغۇرچە",
+"None" => "يوق",
+"Login" => "تىزىمغا كىرىڭ",
 "Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
 "Setup Warning" => "ئاگاھلاندۇرۇش تەڭشەك",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
 "Module 'fileinfo' missing" => "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
 "Sharing" => "ھەمبەھىر",
 "Security" => "بىخەتەرلىك",
+"Server address" => "مۇلازىمېتىر ئادرىسى",
+"Port" => "ئېغىز",
 "Log" => "خاتىرە",
 "Log level" => "خاتىرە دەرىجىسى",
 "More" => "تېخىمۇ كۆپ",
@@ -49,7 +54,6 @@ $TRANSLATIONS = array(
 "Add your App" => "ئەپىڭىزنى قوشۇڭ",
 "More Apps" => "تېخىمۇ كۆپ ئەپلەر",
 "Select an App" => "بىر ئەپ تاللاڭ",
-"User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
 "Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى",
 "Online Documentation" => "توردىكى قوللانما",
 "Forum" => "مۇنبەر",
@@ -61,11 +65,10 @@ $TRANSLATIONS = array(
 "Change password" => "ئىم ئۆزگەرت",
 "Email" => "تورخەت",
 "Your email address" => "تورخەت ئادرېسىڭىز",
-"Fill in an email address to enable password recovery" => "ئىم ئەسلىگە كەلتۈرۈشتە ئىشلىتىدىغان تور خەت ئادرېسىنى تولدۇرۇڭ",
+"Cancel" => "ۋاز كەچ",
 "Language" => "تىل",
 "Help translate" => "تەرجىمىگە ياردەم",
 "WebDAV" => "WebDAV",
-"Encryption" => "شىفىرلاش",
 "Login Name" => "تىزىمغا كىرىش ئاتى",
 "Create" => "قۇر",
 "Default Storage" => "كۆڭۈلدىكى ساقلىغۇچ",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 353e4f1988..7aadb1278d 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Ел. пошта надіслана",
+"Encryption" => "Шифрування",
 "Unable to load list from App Store" => "Не вдалося завантажити список з App Store",
 "Authentication error" => "Помилка автентифікації",
 "Group already exists" => "Група вже існує",
@@ -14,6 +16,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Не вдалося додати користувача у групу %s",
 "Unable to remove user from group %s" => "Не вдалося видалити користувача із групи %s",
 "Couldn't update app." => "Не вдалося оновити програму. ",
+"User Documentation" => "Документація Користувача",
 "Update to {appversion}" => "Оновити до {appversion}",
 "Disable" => "Вимкнути",
 "Enable" => "Включити",
@@ -23,7 +26,6 @@ $TRANSLATIONS = array(
 "Error" => "Помилка",
 "Update" => "Оновити",
 "Updated" => "Оновлено",
-"Saving..." => "Зберігаю...",
 "deleted" => "видалені",
 "undo" => "відмінити",
 "Unable to remove user" => "Неможливо видалити користувача",
@@ -35,6 +37,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Помилка при створенні користувача",
 "A valid password must be provided" => "Потрібно задати вірний пароль",
 "__language_name__" => "__language_name__",
+"None" => "Жоден",
+"Login" => "Логін",
 "Security Warning" => "Попередження про небезпеку",
 "Setup Warning" => "Попередження при Налаштуванні",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
@@ -55,6 +59,9 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
 "Security" => "Безпека",
 "Enforce HTTPS" => "Примусове застосування HTTPS",
+"Server address" => "Адреса сервера",
+"Port" => "Порт",
+"Credentials" => "Облікові дані",
 "Log" => "Протокол",
 "Log level" => "Рівень протоколювання",
 "More" => "Більше",
@@ -66,7 +73,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Вибрати додаток",
 "See application page at apps.owncloud.com" => "Перегляньте сторінку програм на apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
-"User Documentation" => "Документація Користувача",
 "Administrator Documentation" => "Документація Адміністратора",
 "Online Documentation" => "Он-Лайн Документація",
 "Forum" => "Форум",
@@ -83,11 +89,10 @@ $TRANSLATIONS = array(
 "Change password" => "Змінити пароль",
 "Email" => "Ел.пошта",
 "Your email address" => "Ваша адреса електронної пошти",
-"Fill in an email address to enable password recovery" => "Введіть адресу електронної пошти для відновлення паролю",
+"Cancel" => "Відмінити",
 "Language" => "Мова",
 "Help translate" => "Допомогти з перекладом",
 "WebDAV" => "WebDAV",
-"Encryption" => "Шифрування",
 "Login Name" => "Ім'я Логіну",
 "Create" => "Створити",
 "Default Storage" => "сховище за замовчуванням",
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
index ff3eb3d11c..0144e2b534 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Error" => "ایرر",
 "Password" => "پاسورڈ",
 "New password" => "نیا پاسورڈ",
+"Cancel" => "منسوخ کریں",
 "Username" => "یوزر نیم"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index e2e1364902..da9dbdf0a1 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,7 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email đã được gửi",
+"Encryption" => "Mã hóa",
 "Unable to load list from App Store" => "Không thể tải danh sách ứng dụng từ App Store",
 "Authentication error" => "Lỗi xác thực",
+"Your full name has been changed." => "Họ và tên đã được thay đổi.",
+"Unable to change full name" => "Họ và tên không thể đổi ",
 "Group already exists" => "Nhóm đã tồn tại",
 "Unable to add group" => "Không thể thêm nhóm",
 "Email saved" => "Lưu email",
@@ -14,6 +18,7 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s",
 "Unable to remove user from group %s" => "Không thể xóa người dùng từ nhóm %s",
 "Couldn't update app." => "Không thể cập nhật ứng dụng",
+"User Documentation" => "Tài liệu người sử dụng",
 "Update to {appversion}" => "Cập nhật lên {appversion}",
 "Disable" => "Tắt",
 "Enable" => "Bật",
@@ -23,14 +28,17 @@ $TRANSLATIONS = array(
 "Error" => "Lỗi",
 "Update" => "Cập nhật",
 "Updated" => "Đã cập nhật",
-"Saving..." => "Đang lưu...",
 "deleted" => "đã xóa",
 "undo" => "lùi lại",
+"Unable to remove user" => "Không thể xóa người ",
 "Groups" => "Nhóm",
 "Group Admin" => "Nhóm quản trị",
 "Delete" => "Xóa",
 "__language_name__" => "__Ngôn ngữ___",
+"None" => "Không gì cả",
+"Login" => "Đăng nhập",
 "Security Warning" => "Cảnh bảo bảo mật",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Thư mục và các tập tin của bạn có thể được truy cập từ Internet. Tập tin .htaccess không làm việc. Chúng tôi đề nghị bạn cấu hình ebserver ,phân quyền lại thư mục dữ liệu và cấp quyền truy cập hoặc di chuyển thư mục dữ liệu bên ngoài tài liệu gốc máy chủ web.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Thực thi tác vụ mỗi khi trang được tải",
 "Sharing" => "Chia sẻ",
@@ -42,6 +50,9 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ",
 "Allow users to share with anyone" => "Cho phép người dùng chia sẻ với bất cứ ai",
 "Allow users to only share with users in their groups" => "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ",
+"Server address" => "Địa chỉ máy chủ",
+"Port" => "Cổng",
+"Credentials" => "Giấy chứng nhận",
 "Log" => "Log",
 "More" => "hơn",
 "Less" => "ít",
@@ -52,7 +63,6 @@ $TRANSLATIONS = array(
 "Select an App" => "Chọn một ứng dụng",
 "See application page at apps.owncloud.com" => "Xem nhiều ứng dụng hơn tại apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>",
-"User Documentation" => "Tài liệu người sử dụng",
 "Administrator Documentation" => "Tài liệu quản trị",
 "Online Documentation" => "Tài liệu trực tuyến",
 "Forum" => "Diễn đàn",
@@ -67,13 +77,16 @@ $TRANSLATIONS = array(
 "Current password" => "Mật khẩu cũ",
 "New password" => "Mật khẩu mới",
 "Change password" => "Đổi mật khẩu",
+"Full Name" => "Họ và tên",
 "Email" => "Email",
 "Your email address" => "Email của bạn",
-"Fill in an email address to enable password recovery" => "Nhập địa chỉ email của bạn để khôi phục lại mật khẩu",
+"Upload new" => "Tải lên",
+"Remove image" => "Xóa ",
+"Cancel" => "Hủy",
+"Choose as profile image" => "Chọn hình ảnh như hồ sơ cá nhân",
 "Language" => "Ngôn ngữ",
 "Help translate" => "Hỗ trợ dịch thuật",
 "WebDAV" => "WebDAV",
-"Encryption" => "Mã hóa",
 "Login Name" => "Tên đăng nhập",
 "Create" => "Tạo",
 "Default Storage" => "Bộ nhớ mặc định",
@@ -81,6 +94,7 @@ $TRANSLATIONS = array(
 "Other" => "Khác",
 "Username" => "Tên đăng nhập",
 "Storage" => "Bộ nhớ",
+"change full name" => "Đổi họ và t",
 "set new password" => "đặt mật khẩu mới",
 "Default" => "Mặc định"
 );
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 4733a9e429..25943b7020 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,7 +1,11 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "邮件已发送",
+"Encryption" => "加密",
 "Unable to load list from App Store" => "无法从应用商店载入列表",
 "Authentication error" => "认证出错",
+"Your full name has been changed." => "您的全名已修改。",
+"Unable to change full name" => "无法修改全名",
 "Group already exists" => "已存在该组",
 "Unable to add group" => "无法添加组",
 "Email saved" => "电子邮件已保存",
@@ -14,6 +18,10 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "无法把用户添加到组 %s",
 "Unable to remove user from group %s" => "无法从组%s中移除用户",
 "Couldn't update app." => "无法更新 app。",
+"Wrong password" => "错误密码",
+"No user supplied" => "没有满足的用户",
+"Unable to change password" => "不能更改密码",
+"User Documentation" => "用户文档",
 "Update to {appversion}" => "更新至 {appversion}",
 "Disable" => "禁用",
 "Enable" => "开启",
@@ -26,7 +34,6 @@ $TRANSLATIONS = array(
 "Update" => "更新",
 "Updated" => "已更新",
 "Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。",
-"Saving..." => "保存中",
 "deleted" => "已经删除",
 "undo" => "撤销",
 "Unable to remove user" => "无法移除用户",
@@ -37,7 +44,15 @@ $TRANSLATIONS = array(
 "A valid username must be provided" => "必须提供合法的用户名",
 "Error creating user" => "创建用户出错",
 "A valid password must be provided" => "必须提供合法的密码",
+"Warning: Home directory for user \"{user}\" already exists" => "警告：用户 \"{user}\" 的家目录已存在",
 "__language_name__" => "简体中文",
+"Everything (fatal issues, errors, warnings, info, debug)" => "所有（灾难性问题，错误，警告，信息，调试）",
+"Info, warnings, errors and fatal issues" => "信息，警告，错误和灾难性问题",
+"Warnings, errors and fatal issues" => "警告，错误和灾难性问题",
+"Errors and fatal issues" => "错误和灾难性问题",
+"Fatal issues only" => "仅灾难性问题",
+"None" => "无",
+"Login" => "登录",
 "Security Warning" => "安全警告",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
 "Setup Warning" => "设置警告",
@@ -45,11 +60,13 @@ $TRANSLATIONS = array(
 "Please double check the <a href=\"%s\">installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
 "Module 'fileinfo' missing" => "模块'文件信息'丢失",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
+"Your PHP version is outdated" => "您的 PHP 版本不是最新版",
 "Locale not working" => "本地化无法工作",
 "Internet connection not working" => "因特网连接无法工作",
 "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
 "Cron" => "计划任务",
 "Execute one task with each page loaded" => "每个页面加载后执行一个任务",
+"Use systems cron service to call the cron.php file every 15 minutes." => "使用系统 cron 服务每15分钟调用一次 cron.php 文件。",
 "Sharing" => "共享",
 "Enable Share API" => "启用共享API",
 "Allow apps to use the Share API" => "允许应用软件使用共享API",
@@ -61,10 +78,15 @@ $TRANSLATIONS = array(
 "Allow users to share items shared with them again" => "允许用户将共享给他们的项目再次共享",
 "Allow users to share with anyone" => "允许用户向任何人共享",
 "Allow users to only share with users in their groups" => "允许用户只向同组用户共享",
+"Allow mail notification" => "允许邮件通知",
+"Allow user to send mail notification for shared files" => "允许用户为共享的文件发送邮件通知",
 "Security" => "安全",
 "Enforce HTTPS" => "强制使用 HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接连接到%s。",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
+"Server address" => "服务器地址",
+"Port" => "端口",
+"Credentials" => "凭证",
 "Log" => "日志",
 "Log level" => "日志级别",
 "More" => "更多",
@@ -76,7 +98,6 @@ $TRANSLATIONS = array(
 "Select an App" => "选择一个应用",
 "See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>",
-"User Documentation" => "用户文档",
 "Administrator Documentation" => "管理员文档",
 "Online Documentation" => "在线文档",
 "Forum" => "论坛",
@@ -91,14 +112,19 @@ $TRANSLATIONS = array(
 "Current password" => "当前密码",
 "New password" => "新密码",
 "Change password" => "修改密码",
+"Full Name" => "全名",
 "Email" => "电子邮件",
 "Your email address" => "您的电子邮件",
-"Fill in an email address to enable password recovery" => "填写电子邮件地址以启用密码恢复功能",
 "Profile picture" => "联系人图片",
+"Upload new" => "上传新的",
+"Select new from Files" => "从文件中选择一个新的",
+"Remove image" => "移除图片",
+"Your avatar is provided by your original account." => "您的头像由您的原始账户所提供。",
+"Cancel" => "取消",
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "WebDAV" => "WebDAV",
-"Encryption" => "加密",
+"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "使用这个地址 <a href=\"%s\" target=\"_blank\">通过 WebDAV 访问您的文件</a>",
 "Log-in password" => "登录密码",
 "Decrypt all Files" => "解密所有文件",
 "Login Name" => "登录名称",
@@ -106,10 +132,12 @@ $TRANSLATIONS = array(
 "Admin Recovery Password" => "管理恢复密码",
 "Enter the recovery password in order to recover the users files during password change" => "输入恢复密码来在更改密码的时候恢复用户文件",
 "Default Storage" => "默认存储",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
 "Unlimited" => "无限",
 "Other" => "其它",
 "Username" => "用户名",
 "Storage" => "存储",
+"change full name" => "更改全名",
 "set new password" => "设置新密码",
 "Default" => "默认"
 );
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 10fce11fb5..633b4252b6 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -1,12 +1,16 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "郵件已傳",
+"Encryption" => "加密",
 "Error" => "錯誤",
 "Groups" => "群組",
 "Delete" => "刪除",
+"None" => "空",
+"Port" => "連接埠",
 "Password" => "密碼",
 "New password" => "新密碼",
 "Email" => "電郵",
-"Encryption" => "加密",
+"Cancel" => "取消",
 "Username" => "用戶名稱"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 4f7d6ff9cf..f7c834c5d8 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Email sent" => "Email 已寄出",
+"Encryption" => "加密",
 "Unable to load list from App Store" => "無法從 App Store 讀取清單",
 "Authentication error" => "認證錯誤",
 "Group already exists" => "群組已存在",
@@ -20,6 +22,7 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "錯誤的管理者還原密碼",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "後端不支援變更密碼，但成功更新使用者的加密金鑰",
 "Unable to change password" => "無法修改密碼",
+"User Documentation" => "用戶說明文件",
 "Update to {appversion}" => "更新至 {appversion}",
 "Disable" => "停用",
 "Enable" => "啟用",
@@ -33,7 +36,6 @@ $TRANSLATIONS = array(
 "Updated" => "已更新",
 "Select a profile picture" => "選擇大頭貼",
 "Decrypting files... Please wait, this can take some time." => "檔案解密中，請稍候。",
-"Saving..." => "儲存中...",
 "deleted" => "已刪除",
 "undo" => "復原",
 "Unable to remove user" => "無法刪除用戶",
@@ -46,6 +48,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "一定要提供一個有效的密碼",
 "Warning: Home directory for user \"{user}\" already exists" => "警告：使用者 {user} 的家目錄已經存在",
 "__language_name__" => "__language_name__",
+"None" => "無",
+"Login" => "登入",
 "Security Warning" => "安全性警告",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。",
 "Setup Warning" => "設定警告",
@@ -77,6 +81,9 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "強制啟用 HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "強迫用戶端使用加密連線連接到 %s",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。",
+"Server address" => "伺服器位址",
+"Port" => "連接埠",
+"Credentials" => "認證",
 "Log" => "紀錄",
 "Log level" => "紀錄層級",
 "More" => "更多",
@@ -88,7 +95,6 @@ $TRANSLATIONS = array(
 "Select an App" => "選擇一個應用程式",
 "See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>",
-"User Documentation" => "用戶說明文件",
 "Administrator Documentation" => "管理者說明文件",
 "Online Documentation" => "線上說明文件",
 "Forum" => "論壇",
@@ -105,19 +111,17 @@ $TRANSLATIONS = array(
 "Change password" => "變更密碼",
 "Email" => "信箱",
 "Your email address" => "您的電子郵件信箱",
-"Fill in an email address to enable password recovery" => "請填入電子郵件信箱以便回復密碼",
 "Profile picture" => "個人資料照片",
 "Upload new" => "上傳新的",
 "Select new from Files" => "從已上傳的檔案中選一個",
 "Remove image" => "移除圖片",
 "Either png or jpg. Ideally square but you will be able to crop it." => "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它",
-"Abort" => "中斷",
+"Cancel" => "取消",
 "Choose as profile image" => "設定為大頭貼",
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "使用這個地址<a href=\"%s\" target=\"_blank\">來透過 WebDAV 存取檔案</a>",
-"Encryption" => "加密",
 "Log-in password" => "登入密碼",
 "Decrypt all Files" => "解密所有檔案",
 "Login Name" => "登入名稱",
diff --git a/settings/personal.php b/settings/personal.php
index cf1a496bdf..be1aa6400b 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkLoggedIn();
-OC_App::loadApps();
 
 $defaults = new OC_Defaults(); // initialize themable default strings and urls
 
diff --git a/settings/routes.php b/settings/routes.php
index 64f7122f0c..a8bb0d981e 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -6,6 +6,8 @@
  * See the COPYING-README file.
  */
 
+/** @var $this OCP\Route\IRouter */
+
 // Settings pages
 $this->create('settings_help', '/settings/help')
 	->actionInclude('settings/help.php');
@@ -73,5 +75,8 @@ $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php')
 $this->create('settings_mail_settings', '/settings/admin/mailsettings')
 	->post()
 	->action('OC\Settings\Admin\Controller', 'setMailSettings');
+$this->create('settings_admin_mail_test', '/settings/admin/mailtest')
+	->post()
+	->action('OC\Settings\Admin\Controller', 'sendTestMail');
 $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php')
 	->actionInclude('settings/ajax/setsecurity.php');
diff --git a/settings/settings.php b/settings/settings.php
index 1e05452ec4..c08732fcf6 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkLoggedIn();
-OC_App::loadApps();
 
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'settings' );
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 139a9dd076..9092d2833f 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -26,11 +26,15 @@ $mail_smtpsecure = array(
 );
 
 $mail_smtpmode = array(
-	'sendmail',
-	'smtp',
-	'qmail',
 	'php',
+	'smtp',
 );
+if ($_['sendmail_is_available']) {
+	$mail_smtpmode[] = 'sendmail';
+}
+if ($_['mail_smtpmode'] == 'qmail') {
+	$mail_smtpmode[] = 'qmail';
+}
 
 ?>
 
@@ -153,7 +157,24 @@ if (!$_['internetconnectionworking']) {
 ;?>
 
 <fieldset class="personalblock" id="backgroundjobs">
-	<h2><?php p($l->t('Cron'));?></h2>
+	<h2 class="inlineblock"><?php p($l->t('Cron'));?></h2>
+	<?php if ($_['cron_log']): ?>
+	<p class="cronlog inlineblock">
+		<?php if ($_['lastcron'] !== false):
+			$human_time = OC_Util::formatDate($_['lastcron']) . " UTC";
+			if (time() - $_['lastcron'] <= 3600): ?>
+				<span class="cronstatus success"></span>
+				<?php p($l->t("Last cron was executed at %s.", array($human_time)));
+			else: ?>
+				<span class="cronstatus error"></span>
+				<?php p($l->t("Last cron was executed at %s. This is more than an hour ago, something seems wrong.", array($human_time)));
+			endif;
+		else: ?>
+			<span class="cronstatus error"></span>
+			<?php p($l->t("Cron was not executed yet!"));
+		endif; ?>
+	</p>
+	<?php endif; ?>
 	<p>
 				<input type="radio" name="mode" value="ajax"
 					   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
@@ -199,7 +220,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"
@@ -208,7 +228,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"
@@ -272,7 +291,7 @@ if (!$_['internetconnectionworking']) {
 </fieldset>
 
 <fieldset id="mail_settings" class="personalblock">
-	<h2><?php p($l->t('Email Server'));?> <span class="msg"></span></h2>
+	<h2><?php p($l->t('Email Server'));?> <span id="mail_settings_msg" class="msg"></span></h2>
 
 	<p><?php p($l->t('This is used for sending out notifications.')); ?></p>
 
@@ -314,7 +333,7 @@ if (!$_['internetconnectionworking']) {
 	</p>
 
 	<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
-		<label for="mail_smtpauthtype"><?php p($l->t( 'Authentification method' )); ?></label>
+		<label for="mail_smtpauthtype"><?php p($l->t( 'Authentication method' )); ?></label>
 		<select name='mail_smtpauthtype' id='mail_smtpauthtype'>
 			<?php foreach ($mail_smtpauthtype as $authtype => $name):
 				$selected = '';
@@ -347,6 +366,10 @@ if (!$_['internetconnectionworking']) {
 			   placeholder="<?php p($l->t('SMTP Password'))?>" value='<?php p($_['mail_smtppassword']) ?>' />
 	</p>
 
+	<br />
+	<em><?php p($l->t( 'Test email settings' )); ?></em>
+	<input type="submit" name="sendtestemail" id="sendtestemail" value="<?php p($l->t( 'Send email' )); ?>"/>
+	<span id="sendtestmail_msg" class="msg"></span>
 </fieldset>
 
 <fieldset class="personalblock">
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 470b8180bc..9024f43565 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -83,7 +83,7 @@ if($_['passwordChangeSupported']) {
 			placeholder="<?php p($l->t('Your email address'));?>"
 			autocomplete="on" autocapitalize="off" autocorrect="off" />
 		<span class="msg"></span><br />
-		<em><?php p($l->t('Fill in an email address to enable password recovery'));?></em>
+		<em><?php p($l->t('Fill in an email address to enable password recovery and receive notifications'));?></em>
 	</fieldset>
 </form>
 <?php
diff --git a/settings/users.php b/settings/users.php
index 2f1c63a0b5..f09d0e90d3 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkSubAdminUser();
-OC_App::loadApps();
 
 // We have some javascript foo!
 OC_Util::addScript( 'settings', 'users' );
diff --git a/status.php b/status.php
index 88422100f1..861eaed9cd 100644
--- a/status.php
+++ b/status.php
@@ -21,8 +21,6 @@
 *
 */
 
-$RUNTIME_NOAPPS = true; //no apps, yet
-
 try {
 
 	require_once 'lib/base.php';
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 581cfcff9f..99374d68a5 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,11 +3,17 @@
 
 define('PHPUNIT_RUN', 1);
 
-require_once __DIR__.'/../lib/base.php';
+$configDir = getenv('CONFIG_DIR');
+if ($configDir) {
+	define('PHPUNIT_CONFIG_DIR', $configDir);
+}
 
-if(!class_exists('PHPUnit_Framework_TestCase')) {
+require_once __DIR__ . '/../lib/base.php';
+
+if (!class_exists('PHPUnit_Framework_TestCase')) {
 	require_once('PHPUnit/Autoload.php');
 }
 
 OC_Hook::clear();
 OC_Log::$enabled = false;
+OC_FileProxy::clearProxies();
diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php
index 56e625fd16..735dd7cef4 100644
--- a/tests/lib/appframework/routing/RoutingTest.php
+++ b/tests/lib/appframework/routing/RoutingTest.php
@@ -46,7 +46,7 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase
 		));
 
 		// router mock
-		$router = $this->getMock("\OC_Router", array('create'));
+		$router = $this->getMock("\OC\Route\Router", array('create'));
 
 		// load route configuration
 		$container = new DIContainer('app1');
@@ -91,7 +91,7 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase
 		$route = $this->mockRoute($verb, $controllerName, $actionName);
 
 		// router mock
-		$router = $this->getMock("\OC_Router", array('create'));
+		$router = $this->getMock("\OC\Route\Router", array('create'));
 
 		// we expect create to be called once:
 		$router
@@ -116,7 +116,7 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase
 	private function assertResource($yaml, $resourceName, $url, $controllerName, $paramName)
 	{
 		// router mock
-		$router = $this->getMock("\OC_Router", array('create'));
+		$router = $this->getMock("\OC\Route\Router", array('create'));
 
 		// route mocks
 		$indexRoute = $this->mockRoute('GET', $controllerName, 'index');
@@ -174,7 +174,7 @@ class RouteConfigTest extends \PHPUnit_Framework_TestCase
 	private function mockRoute($verb, $controllerName, $actionName)
 	{
 		$container = new DIContainer('app1');
-		$route = $this->getMock("\OC_Route", array('method', 'action'), array(), '', false);
+		$route = $this->getMock("\OC\Route\Route", array('method', 'action'), array(), '', false);
 		$route
 			->expects($this->exactly(1))
 			->method('method')
diff --git a/tests/lib/files/cache/homecache.php b/tests/lib/files/cache/homecache.php
index dbcf6e9caa..80dc54c9d1 100644
--- a/tests/lib/files/cache/homecache.php
+++ b/tests/lib/files/cache/homecache.php
@@ -90,7 +90,6 @@ class HomeCache extends \PHPUnit_Framework_TestCase {
 
 		// check that files and root size ignored the unknown sizes
 		$this->assertEquals(1000, $this->cache->calculateFolderSize('files'));
-		$this->assertEquals(1000, $this->cache->calculateFolderSize(''));
 
 		// clean up
 		$this->cache->remove('');
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index a6ee8c4666..e2fae0ae57 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -65,11 +65,6 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		Filesystem::mount($this->storage, array(), '/' . self::$user . '/files');
 
 		\OC_Hook::clear('OC_Filesystem');
-
-		\OC_Hook::connect('OC_Filesystem', 'post_write', '\OC\Files\Cache\Updater', 'writeHook');
-		\OC_Hook::connect('OC_Filesystem', 'post_delete', '\OC\Files\Cache\Updater', 'deleteHook');
-		\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
-		\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
 	}
 
 	public function tearDown() {
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 90f1dfe581..53f528af79 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -226,4 +226,55 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
 		$path = $arguments['path'];
 		$this->assertEquals($path, \OC\Files\Filesystem::normalizePath($path)); //the path passed to the hook should already be normalized
 	}
+
+	/**
+	 * Test that the default cache dir is part of the user's home
+	 */
+	public function testMountDefaultCacheDir() {
+		$userId = uniqid('user_');
+		$oldCachePath = \OC_Config::getValue('cache_path', '');
+		// no cache path configured
+		\OC_Config::setValue('cache_path', '');
+
+		\OC_User::createUser($userId, $userId);
+		\OC\Files\Filesystem::initMountPoints($userId);
+
+		$this->assertEquals(
+			'/' . $userId . '/',
+			\OC\Files\Filesystem::getMountPoint('/' . $userId . '/cache')
+		);
+		list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache');
+		$this->assertInstanceOf('\OC\Files\Storage\Home', $storage);
+		$this->assertEquals('cache', $internalPath);
+		\OC_User::deleteUser($userId);
+
+		\OC_Config::setValue('cache_path', $oldCachePath);
+	}
+
+	/**
+	 * Test that an external cache is mounted into
+	 * the user's home
+	 */
+	public function testMountExternalCacheDir() {
+		$userId = uniqid('user_');
+
+		$oldCachePath = \OC_Config::getValue('cache_path', '');
+		// set cache path to temp dir
+		$cachePath = \OC_Helper::tmpFolder() . '/extcache';
+		\OC_Config::setValue('cache_path', $cachePath);
+
+		\OC_User::createUser($userId, $userId);
+		\OC\Files\Filesystem::initMountPoints($userId);
+
+		$this->assertEquals(
+			'/' . $userId . '/cache/',
+			\OC\Files\Filesystem::getMountPoint('/' . $userId . '/cache')
+		);
+		list($storage, $internalPath) = \OC\Files\Filesystem::resolvePath('/' . $userId . '/cache');
+		$this->assertInstanceOf('\OC\Files\Storage\Local', $storage);
+		$this->assertEquals('', $internalPath);
+		\OC_User::deleteUser($userId);
+
+		\OC_Config::setValue('cache_path', $oldCachePath);
+	}
 }
diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index f929175860..f3bfba3feb 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -64,17 +64,17 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 	 * @dataProvider directoryProvider
 	 */
 	public function testDirectories($directory) {
-		$this->assertFalse($this->instance->file_exists('/'.$directory));
+		$this->assertFalse($this->instance->file_exists('/' . $directory));
 
-		$this->assertTrue($this->instance->mkdir('/'.$directory));
+		$this->assertTrue($this->instance->mkdir('/' . $directory));
 
-		$this->assertTrue($this->instance->file_exists('/'.$directory));
-		$this->assertTrue($this->instance->is_dir('/'.$directory));
-		$this->assertFalse($this->instance->is_file('/'.$directory));
-		$this->assertEquals('dir', $this->instance->filetype('/'.$directory));
-		$this->assertEquals(0, $this->instance->filesize('/'.$directory));
-		$this->assertTrue($this->instance->isReadable('/'.$directory));
-		$this->assertTrue($this->instance->isUpdatable('/'.$directory));
+		$this->assertTrue($this->instance->file_exists('/' . $directory));
+		$this->assertTrue($this->instance->is_dir('/' . $directory));
+		$this->assertFalse($this->instance->is_file('/' . $directory));
+		$this->assertEquals('dir', $this->instance->filetype('/' . $directory));
+		$this->assertEquals(0, $this->instance->filesize('/' . $directory));
+		$this->assertTrue($this->instance->isReadable('/' . $directory));
+		$this->assertTrue($this->instance->isUpdatable('/' . $directory));
 
 		$dh = $this->instance->opendir('/');
 		$content = array();
@@ -85,13 +85,13 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		}
 		$this->assertEquals(array($directory), $content);
 
-		$this->assertFalse($this->instance->mkdir('/'.$directory)); //cant create existing folders
-		$this->assertTrue($this->instance->rmdir('/'.$directory));
+		$this->assertFalse($this->instance->mkdir('/' . $directory)); //cant create existing folders
+		$this->assertTrue($this->instance->rmdir('/' . $directory));
 
 		$this->wait();
-		$this->assertFalse($this->instance->file_exists('/'.$directory));
+		$this->assertFalse($this->instance->file_exists('/' . $directory));
 
-		$this->assertFalse($this->instance->rmdir('/'.$directory)); //cant remove non existing folders
+		$this->assertFalse($this->instance->rmdir('/' . $directory)); //cant remove non existing folders
 
 		$dh = $this->instance->opendir('/');
 		$content = array();
@@ -103,8 +103,7 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(array(), $content);
 	}
 
-	public function directoryProvider()
-	{
+	public function directoryProvider() {
 		return array(
 			array('folder'),
 			array(' folder'),
@@ -113,6 +112,7 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 			array('spéciäl földer'),
 		);
 	}
+
 	/**
 	 * test the various uses of file_get_contents and file_put_contents
 	 */
@@ -298,4 +298,21 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 		$this->assertFalse($this->instance->file_exists('folder/bar'));
 		$this->assertFalse($this->instance->file_exists('folder'));
 	}
+
+	public function hashProvider(){
+		return array(
+			array('Foobar', 'md5'),
+			array('Foobar', 'sha1'),
+			array('Foobar', 'sha256'),
+		);
+	}
+
+	/**
+	 * @dataProvider hashProvider
+	 */
+	public function testHash($data, $type) {
+		$this->instance->file_put_contents('hash.txt', $data);
+		$this->assertEquals(hash($type, $data), $this->instance->hash($type, 'hash.txt'));
+		$this->assertEquals(hash($type, $data, true), $this->instance->hash($type, 'hash.txt', true));
+	}
 }
diff --git a/tests/lib/files/storage/wrapper/quota.php b/tests/lib/files/storage/wrapper/quota.php
index 43eae78415..777529fd85 100644
--- a/tests/lib/files/storage/wrapper/quota.php
+++ b/tests/lib/files/storage/wrapper/quota.php
@@ -53,6 +53,40 @@ class Quota extends \Test\Files\Storage\Storage {
 		$this->assertEquals(9, $instance->free_space(''));
 	}
 
+	public function testFreeSpaceWithUsedSpace() {
+		$instance = $this->getLimitedStorage(9);
+		$instance->getCache()->put(
+			'', array('size' => 3, 'unencrypted_size' => 0)
+		);
+		$this->assertEquals(6, $instance->free_space(''));
+	}
+
+	public function testFreeSpaceWithUnknownDiskSpace() {
+		$storage = $this->getMock(
+			'\OC\Files\Storage\Local',
+			array('free_space'),
+			array(array('datadir' => $this->tmpDir))
+		);
+		$storage->expects($this->any())
+			->method('free_space')
+			->will($this->returnValue(-2));
+		$storage->getScanner()->scan('');
+
+		$instance = new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => 9));
+		$instance->getCache()->put(
+			'', array('size' => 3, 'unencrypted_size' => 0)
+		);
+		$this->assertEquals(6, $instance->free_space(''));
+	}
+
+	public function testFreeSpaceWithUsedSpaceAndEncryption() {
+		$instance = $this->getLimitedStorage(9);
+		$instance->getCache()->put(
+			'', array('size' => 7, 'unencrypted_size' => 3)
+		);
+		$this->assertEquals(6, $instance->free_space(''));
+	}
+
 	public function testFWriteNotEnoughSpace() {
 		$instance = $this->getLimitedStorage(9);
 		$stream = $instance->fopen('foo', 'w+');
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 4311215795..0943e6bc1b 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -23,6 +23,7 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
 			array('0 B', 0),
 			array('1 kB', 1024),
 			array('9.5 MB', 10000000),
+			array('1.3 GB', 1395864371),
 			array('465.7 GB', 500000000000),
 			array('454.7 TB', 500000000000000),
 			array('444.1 PB', 500000000000000000),
@@ -41,8 +42,9 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
 		return array(
 			array(0.0, "0 B"),
 			array(1024.0, "1 kB"),
+			array(1395864371.0, '1.3 GB'),
 			array(9961472.0, "9.5 MB"),
-			array(500041567436.8, "465.7 GB"),
+			array(500041567437.0, "465.7 GB"),
 		);
 	}
 
diff --git a/tests/lib/helperstorage.php b/tests/lib/helperstorage.php
new file mode 100644
index 0000000000..010a54e3bb
--- /dev/null
+++ b/tests/lib/helperstorage.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * Test the storage functions of OC_Helper
+ */
+class Test_Helper_Storage extends PHPUnit_Framework_TestCase {
+	private $user;
+	private $storageMock;
+
+	public function setUp() {
+		$this->user = 'user_' . uniqid();
+		\OC\Files\Filesystem::tearDown();
+		\OC\Files\Filesystem::init($this->user, '/' . $this->user . '/files');
+
+		$this->storageMock = $this->getMock(
+			'\OC\Files\Storage\Temporary',
+			array('free_space'),
+			array('')
+		);
+
+		\OC\Files\Filesystem::clearMounts();
+
+		$this->storageMock->expects($this->once())
+			->method('free_space')
+			->will($this->returnValue(12));
+	}
+
+	public function tearDown() {
+		$this->user = null;
+
+		$this->storageMock->getCache()->clear();
+		\OC\Files\Filesystem::tearDown();
+	}
+
+	/**
+	 * Test getting the storage info
+	 */
+	function testGetStorageInfo() {
+		\OC\Files\Filesystem::mount($this->storageMock, array(), '/' . $this->user . '/files');
+		$this->storageMock->file_put_contents('test.txt', '01234');
+
+		$storageInfo = \OC_Helper::getStorageInfo('');
+		$this->assertEquals(12, $storageInfo['free']);
+		$this->assertEquals(5, $storageInfo['used']);
+		$this->assertEquals(17, $storageInfo['total']);
+	}
+
+	/**
+	 * Test getting the storage info with quota enabled
+	 */
+	function testGetStorageInfoWithQuota() {
+		$this->storageMock->file_put_contents('test.txt', '01234');
+		$this->storageMock = new \OC\Files\Storage\Wrapper\Quota(
+			array(
+				'storage' => $this->storageMock,
+				'quota' => 7
+			)
+		);
+		\OC\Files\Filesystem::mount($this->storageMock, array(), '/' . $this->user . '/files');
+
+		$storageInfo = \OC_Helper::getStorageInfo('');
+		$this->assertEquals(2, $storageInfo['free']);
+		$this->assertEquals(5, $storageInfo['used']);
+		$this->assertEquals(7, $storageInfo['total']);
+	}
+
+	/**
+	 * Test getting the storage info when data exceeds quota
+	 */
+	function testGetStorageInfoWhenSizeExceedsQuota() {
+		$this->storageMock->file_put_contents('test.txt', '0123456789');
+		$this->storageMock = new \OC\Files\Storage\Wrapper\Quota(
+			array(
+				'storage' => $this->storageMock,
+				'quota' => 7
+			)
+		);
+		\OC\Files\Filesystem::mount($this->storageMock, array(), '/' . $this->user . '/files');
+
+		$storageInfo = \OC_Helper::getStorageInfo('');
+		$this->assertEquals(0, $storageInfo['free']);
+		$this->assertEquals(10, $storageInfo['used']);
+		// total = quota
+		$this->assertEquals(7, $storageInfo['total']);
+	}
+
+	/**
+	 * Test getting the storage info when the remaining
+	 * free storage space is less than the quota
+	 */
+	function testGetStorageInfoWhenFreeSpaceLessThanQuota() {
+		$this->storageMock->file_put_contents('test.txt', '01234');
+		$this->storageMock = new \OC\Files\Storage\Wrapper\Quota(
+			array(
+				'storage' => $this->storageMock,
+				'quota' => 18
+			)
+		);
+		\OC\Files\Filesystem::mount($this->storageMock, array(), '/' . $this->user . '/files');
+
+		$storageInfo = \OC_Helper::getStorageInfo('');
+		$this->assertEquals(12, $storageInfo['free']);
+		$this->assertEquals(5, $storageInfo['used']);
+		// total = free + used (because quota > total)
+		$this->assertEquals(17, $storageInfo['total']);
+	}
+}
diff --git a/tests/lib/image.php b/tests/lib/image.php
index 4aba1b0bc6..131a9d86f3 100644
--- a/tests/lib/image.php
+++ b/tests/lib/image.php
@@ -8,8 +8,8 @@
 
 class Test_Image extends PHPUnit_Framework_TestCase {
 	public static function tearDownAfterClass() {
-		unlink(OC::$SERVERROOT.'/tests/data/testimage2.png');
-		unlink(OC::$SERVERROOT.'/tests/data/testimage2.jpg');
+		@unlink(OC::$SERVERROOT.'/tests/data/testimage2.png');
+		@unlink(OC::$SERVERROOT.'/tests/data/testimage2.jpg');
 	}
 
 	public function testGetMimeTypeForFile() {
@@ -236,4 +236,24 @@ class Test_Image extends PHPUnit_Framework_TestCase {
 		$this->assertEquals(200, $img->width());
 		$this->assertEquals(200, $img->height());
 	}
+
+	function convertDataProvider() {
+		return array(
+			array( 'image/gif'),
+			array( 'image/jpeg'),
+			array( 'image/png'),
+		);
+	}
+
+	/**
+	 * @dataProvider convertDataProvider
+	 */
+	public function testConvert($mimeType) {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$tempFile = tempnam(sys_get_temp_dir(), 'img-test');
+
+		$img->save($tempFile, $mimeType);
+		$actualMimeType = \OC_Image::getMimeTypeForFile($tempFile);
+		$this->assertEquals($mimeType, $actualMimeType);
+	}
 }
diff --git a/tests/lib/mail.php b/tests/lib/mail.php
new file mode 100644
index 0000000000..a88a9d797a
--- /dev/null
+++ b/tests/lib/mail.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+class Test_Mail extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * @dataProvider buildAsciiEmailProvider
+	 * @param $expected
+	 * @param $address
+	 */
+	public function testBuildAsciiEmail($expected, $address) {
+		$actual = \OC_Mail::buildAsciiEmail($address);
+		$this->assertEquals($expected, $actual);
+	}
+
+	function buildAsciiEmailProvider() {
+		return array(
+			array('info@example.com', 'info@example.com'),
+			array('info@xn--cjr6vy5ejyai80u.com', 'info@國際化域名.com'),
+			array('info@xn--mller-kva.de', 'info@müller.de'),
+			array('info@xn--mller-kva.xn--mller-kva.de', 'info@müller.müller.de'),
+		);
+	}
+
+}
diff --git a/tests/lib/request.php b/tests/lib/request.php
index 1d77acc70a..bff84e1b03 100644
--- a/tests/lib/request.php
+++ b/tests/lib/request.php
@@ -135,4 +135,141 @@ class Test_Request extends PHPUnit_Framework_TestCase {
 			),
 		);
 	}
+
+	public function testInsecureServerHost() {
+		unset($_SERVER['HTTP_X_FORWARDED_HOST']);
+		unset($_SERVER['HTTP_HOST']);
+		unset($_SERVER['SERVER_NAME']);
+		$_SERVER['SERVER_NAME'] = 'from.server.name:8080';
+		$host = OC_Request::insecureServerHost();
+		$this->assertEquals('from.server.name:8080', $host);
+
+		$_SERVER['HTTP_HOST'] = 'from.host.header:8080';
+		$host = OC_Request::insecureServerHost();
+		$this->assertEquals('from.host.header:8080', $host);
+
+		$_SERVER['HTTP_X_FORWARDED_HOST'] = 'from.forwarded.host:8080';
+		$host = OC_Request::insecureServerHost();
+		$this->assertEquals('from.forwarded.host:8080', $host);
+
+		$_SERVER['HTTP_X_FORWARDED_HOST'] = 'from.forwarded.host2:8080,another.one:9000';
+		$host = OC_Request::insecureServerHost();
+		$this->assertEquals('from.forwarded.host2:8080', $host);
+
+		// clean up
+		unset($_SERVER['HTTP_X_FORWARDED_HOST']);
+		unset($_SERVER['HTTP_HOST']);
+		unset($_SERVER['SERVER_NAME']);
+	}
+
+	public function testGetOverwriteHost() {
+		unset($_SERVER['REMOTE_ADDR']);
+		OC_Config::deleteKey('overwritecondaddr');
+		OC_Config::deleteKey('overwritehost');
+		$host = OC_Request::getOverwriteHost();
+		$this->assertNull($host);
+
+		OC_Config::setValue('overwritehost', '');
+		$host = OC_Request::getOverwriteHost();
+		$this->assertNull($host);
+
+		OC_Config::setValue('overwritehost', 'host.one.test:8080');
+		$host = OC_Request::getOverwriteHost();
+		$this->assertEquals('host.one.test:8080', $host);
+
+		$_SERVER['REMOTE_ADDR'] = 'somehost.test:8080';
+		OC_Config::setValue('overwritecondaddr', '^somehost\..*$');
+		$host = OC_Request::getOverwriteHost();
+		$this->assertEquals('host.one.test:8080', $host);
+
+		OC_Config::setValue('overwritecondaddr', '^somethingelse.*$');
+		$host = OC_Request::getOverwriteHost();
+		$this->assertNull($host);
+
+		// clean up
+		unset($_SERVER['REMOTE_ADDR']);
+		OC_Config::deleteKey('overwritecondaddr');
+		OC_Config::deleteKey('overwritehost');
+	}
+
+	/**
+	 * @dataProvider trustedDomainDataProvider
+	 */
+	public function testIsTrustedDomain($trustedDomains, $testDomain, $result) {
+		OC_Config::deleteKey('trusted_domains');
+		if ($trustedDomains !== null) {
+			OC_Config::setValue('trusted_domains', $trustedDomains);
+		}
+
+		$this->assertEquals($result, OC_Request::isTrustedDomain($testDomain));
+
+		// clean up
+		OC_Config::deleteKey('trusted_domains');
+	}
+
+	public function trustedDomainDataProvider() {
+		$trustedHostTestList = array('host.one.test:8080', 'host.two.test:8080');
+		return array(
+			// empty defaults to true
+			array(null, 'host.one.test:8080', true),
+			array('', 'host.one.test:8080', true),
+			array(array(), 'host.one.test:8080', true),
+
+			// trust list when defined
+			array($trustedHostTestList, 'host.two.test:8080', true),
+			array($trustedHostTestList, 'host.two.test:9999', false),
+			array($trustedHostTestList, 'host.three.test:8080', false),
+
+			// trust localhost regardless of trust list
+			array($trustedHostTestList, 'localhost', true),
+			array($trustedHostTestList, 'localhost:8080', true),
+			array($trustedHostTestList, '127.0.0.1', true),
+			array($trustedHostTestList, '127.0.0.1:8080', true),
+
+			// do not trust invalid localhosts
+			array($trustedHostTestList, 'localhost:1:2', false),
+			array($trustedHostTestList, 'localhost: evil.host', false),
+		);
+	}
+
+	public function testServerHost() {
+		OC_Config::deleteKey('overwritecondaddr');
+		OC_Config::setValue('overwritehost', 'overwritten.host:8080');
+		OC_Config::setValue(
+			'trusted_domains',
+			array(
+				'trusted.host:8080',
+				'second.trusted.host:8080'
+			)
+		);
+		$_SERVER['HTTP_HOST'] = 'trusted.host:8080';
+
+		// CLI always gives localhost
+		$oldCLI = OC::$CLI;
+		OC::$CLI = true;
+		$host = OC_Request::serverHost();
+		$this->assertEquals('localhost', $host);
+		OC::$CLI = false;
+
+		// overwritehost overrides trusted domain
+		$host = OC_Request::serverHost();
+		$this->assertEquals('overwritten.host:8080', $host);
+
+		// trusted domain returned when used
+		OC_Config::deleteKey('overwritehost');
+		$host = OC_Request::serverHost();
+		$this->assertEquals('trusted.host:8080', $host);
+
+		// trusted domain returned when untrusted one in header
+		$_SERVER['HTTP_HOST'] = 'untrusted.host:8080';
+		OC_Config::deleteKey('overwritehost');
+		$host = OC_Request::serverHost();
+		$this->assertEquals('trusted.host:8080', $host);
+
+		// clean up
+		OC_Config::deleteKey('overwritecondaddr');
+		OC_Config::deleteKey('overwritehost');
+		unset($_SERVER['HTTP_HOST']);
+		OC::$CLI = $oldCLI;
+	}
 }
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index b5cba9430a..aae91fa108 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -282,7 +282,7 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 		OC_User::setUserId($this->user2);
 		$this->assertEquals(array(OCP\PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		OC_User::setUserId($this->user3);
-		$this->assertFalse(OCP\Share::getItemSharedWith('test', 'test.txt'));
+		$this->assertSame(array(), OCP\Share::getItemSharedWith('test', 'test.txt'));
 
 		// Reshare again, and then have owner unshare
 		OC_User::setUserId($this->user1);
@@ -292,9 +292,9 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
 		OC_User::setUserId($this->user2);
-		$this->assertFalse(OCP\Share::getItemSharedWith('test', 'test.txt'));
+		$this->assertSame(array(), OCP\Share::getItemSharedWith('test', 'test.txt'));
 		OC_User::setUserId($this->user3);
-		$this->assertFalse(OCP\Share::getItemSharedWith('test', 'test.txt'));
+		$this->assertSame(array(), OCP\Share::getItemSharedWith('test', 'test.txt'));
 
 		// Attempt target conflict
 		OC_User::setUserId($this->user1);
@@ -325,7 +325,7 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 		);
 
 		OC_User::setUserId($this->user2);
-		$this->assertFalse(
+		$this->assertSame(array(),
 			OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
 			'Failed asserting that user 2 no longer has access to test.txt after expiration.'
 		);
@@ -526,13 +526,13 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 		);
 
 		OC_User::setUserId($this->user2);
-		$this->assertFalse(
+		$this->assertSame(array(),
 			OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
 			'Failed asserting that user 2 no longer has access to test.txt after expiration.'
 		);
 
 		OC_User::setUserId($this->user3);
-		$this->assertFalse(
+		$this->assertSame(array(),
 			OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
 			'Failed asserting that user 3 no longer has access to test.txt after expiration.'
 		);
diff --git a/tests/lib/urlgenerator.php b/tests/lib/urlgenerator.php
index 875a7f0658..8e605d88f3 100644
--- a/tests/lib/urlgenerator.php
+++ b/tests/lib/urlgenerator.php
@@ -12,17 +12,32 @@ class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
 	/**
 	 * @small
 	 * @brief test absolute URL construction
-	 * @dataProvider provideURLs
+	 * @dataProvider provideDocRootURLs
 	 */
-	function testGetAbsoluteURL($url, $expectedResult) {
+	function testGetAbsoluteURLDocRoot($url, $expectedResult) {
 
+		\OC::$WEBROOT = '';
 		$urlGenerator = new \OC\URLGenerator(null);
 		$result = $urlGenerator->getAbsoluteURL($url);
 
 		$this->assertEquals($expectedResult, $result);
 	}
 
-	public function provideURLs() {
+	/**
+	 * @small
+	 * @brief test absolute URL construction
+	 * @dataProvider provideSubDirURLs
+	 */
+	function testGetAbsoluteURLSubDir($url, $expectedResult) {
+
+		\OC::$WEBROOT = '/owncloud';
+		$urlGenerator = new \OC\URLGenerator(null);
+		$result = $urlGenerator->getAbsoluteURL($url);
+
+		$this->assertEquals($expectedResult, $result);
+	}
+
+	public function provideDocRootURLs() {
 		return array(
 			array("index.php", "http://localhost/index.php"),
 			array("/index.php", "http://localhost/index.php"),
@@ -30,5 +45,14 @@ class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
 			array("apps/index.php", "http://localhost/apps/index.php"),
 			);
 	}
+
+	public function provideSubDirURLs() {
+		return array(
+			array("index.php", "http://localhost/owncloud/index.php"),
+			array("/index.php", "http://localhost/owncloud/index.php"),
+			array("/apps/index.php", "http://localhost/owncloud/apps/index.php"),
+			array("apps/index.php", "http://localhost/owncloud/apps/index.php"),
+			);
+	}
 }
 
diff --git a/tests/lib/utilcheckserver.php b/tests/lib/utilcheckserver.php
new file mode 100644
index 0000000000..155d617c4a
--- /dev/null
+++ b/tests/lib/utilcheckserver.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * Tests for server check functions
+ */
+class Test_Util_CheckServer extends PHPUnit_Framework_TestCase {
+
+	private $datadir;
+
+	public function setUp() {
+		$this->datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data');
+
+		file_put_contents($this->datadir . '/.ocdata', '');
+	}
+
+	public function tearDown() {
+		// clean up
+		@unlink($this->datadir . '/.ocdata');
+	}
+
+	/**
+	 * Test that checkServer() returns no errors in the regular case.
+	 */
+	public function testCheckServer() {
+		$result = \OC_Util::checkServer();
+		$this->assertEmpty($result);
+	}
+
+	/**
+	 * Test that checkServer() does not check the data dir validity
+	 * when the server is not installed yet (else the setup cannot
+	 * be run...)
+	 */
+	public function testCheckServerSkipDataDirValidityOnSetup() {
+		// simulate old version that didn't have it
+		unlink($this->datadir . '/.ocdata');
+
+		$session = \OC::$server->getSession();
+		$oldInstalled = \OC_Config::getValue('installed', false);
+
+		// simulate that the server isn't setup yet
+		\OC_Config::setValue('installed', false);
+
+		// even though ".ocdata" is missing, the error isn't
+		// triggered to allow setup to run
+		$result = \OC_Util::checkServer();
+		$this->assertEmpty($result);
+
+		// restore config
+		\OC_Config::setValue('installed', $oldInstalled);
+	}
+
+	/**
+	 * Test that checkServer() does not check the data dir validity
+	 * when an upgrade is required (else the upgrade cannot be
+	 * performed...)
+	 */
+	public function testCheckServerSkipDataDirValidityOnUpgrade() {
+		// simulate old version that didn't have it
+		unlink($this->datadir . '/.ocdata');
+
+		$session = \OC::$server->getSession();
+		$oldCurrentVersion = $session->get('OC_Version');
+		$oldInstallVersion = \OC_Config::getValue('version', '0.0.0');
+
+		// upgrade condition to simulate needUpgrade() === true
+		$session->set('OC_Version', array(6, 0, 0, 2));
+		\OC_Config::setValue('version', '6.0.0.1');
+
+		// even though ".ocdata" is missing, the error isn't
+		// triggered to allow for upgrade
+		$result = \OC_Util::checkServer();
+		$this->assertEmpty($result);
+
+		// restore versions
+		$session->set('OC_Version', $oldCurrentVersion);
+		\OC_Config::setValue('version', $oldInstallVersion);
+	}
+
+	/**
+	 * Test that checkDataDirectoryValidity returns no error
+	 * when ".ocdata" is present.
+	 */
+	public function testCheckDataDirValidity() {
+		$result = \OC_Util::checkDataDirectoryValidity($this->datadir);
+		$this->assertEmpty($result);
+	}
+
+	/**
+	 * Test that checkDataDirectoryValidity and checkServer 
+	 * both return an error when ".ocdata" is missing.
+	 */
+	public function testCheckDataDirValidityWhenFileMissing() {
+		unlink($this->datadir . '/.ocdata');
+		$result = \OC_Util::checkDataDirectoryValidity($this->datadir);
+		$this->assertEquals(1, count($result));
+
+		$result = \OC_Util::checkServer();
+		$this->assertEquals(1, count($result));
+	}
+
+}
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 1a2ab35491..872ff2c259 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -36,6 +36,7 @@
 		</whitelist>
 	</filter>
 	<listeners>
+		<listener class="StartSessionListener" file="startsessionlistener.php" />
 	  <listener class="TestCleanupListener" file="testcleanuplistener.php">
 		<arguments>
 			<string>detail</string>
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
index 71a4ff2762..21c63ea046 100644
--- a/tests/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@ -29,4 +29,7 @@
 			</exclude>
 		</whitelist>
 	</filter>
+	<listeners>
+		<listener class="StartSessionListener" file="startsessionlistener.php" />
+	</listeners>
 </phpunit>
diff --git a/tests/startsessionlistener.php b/tests/startsessionlistener.php
new file mode 100644
index 0000000000..808a2a2226
--- /dev/null
+++ b/tests/startsessionlistener.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * Starts a new session before each test execution
+ */
+class StartSessionListener implements PHPUnit_Framework_TestListener {
+
+	public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) {
+	}
+
+	public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {
+	}
+
+	public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
+	}
+
+	public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
+	}
+
+	public function startTest(PHPUnit_Framework_Test $test) {
+	}
+
+	public function endTest(PHPUnit_Framework_Test $test, $time) {
+		// reopen the session - only allowed for memory session
+		if (\OC::$session instanceof \OC\Session\Memory) {
+			/** @var $session \OC\Session\Memory */
+			$session = \OC::$session;
+			$session->reopen();
+		}
+	}
+
+	public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
+	}
+
+	public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {
+	}
+
+}
diff --git a/tests/testcleanuplistener.php b/tests/testcleanuplistener.php
index 299a589ef4..2083ffce67 100644
--- a/tests/testcleanuplistener.php
+++ b/tests/testcleanuplistener.php
@@ -83,6 +83,7 @@ class TestCleanupListener implements PHPUnit_Framework_TestListener {
 		$knownEntries = array(
 			'owncloud.log' => true,
 			'owncloud.db' => true,
+			'.ocdata' => true,
 			'..' => true,
 			'.' => true
 		);
diff --git a/version.php b/version.php
index 470aa89507..5e5fa22cf8 100644
--- a/version.php
+++ b/version.php
@@ -1,7 +1,7 @@
 <?php
 
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel when updating major/minor version number.
-$OC_Version=array(6, 90, 0, 1);
+$OC_Version=array(6, 90, 0, 2);
 
 // The human readable string
 $OC_VersionString='7.0 pre alpha';